~mdw
/
termux-packages
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
postgresql: Update from 9.6.2 to 9.6.3
[termux-packages]
/
packages
/
aapt
/
build.sh
diff --git
a/packages/aapt/build.sh
b/packages/aapt/build.sh
index
410eee7
..
3f5d682
100644
(file)
--- a/
packages/aapt/build.sh
+++ b/
packages/aapt/build.sh
@@
-1,12
+1,14
@@
+# FIXME: We would like to enable checksums when downloading
+# tar files, but they change each time as the tar metadata
+# differs: https://github.com/google/gitiles/issues/84
TERMUX_PKG_HOMEPAGE=http://elinux.org/Android_aapt
TERMUX_PKG_DESCRIPTION="Android Asset Packaging Tool"
_TAG_VERSION=7.0.0
_TAG_REVISION=14
TERMUX_PKG_VERSION=${_TAG_VERSION}.${_TAG_REVISION}
TERMUX_PKG_HOMEPAGE=http://elinux.org/Android_aapt
TERMUX_PKG_DESCRIPTION="Android Asset Packaging Tool"
_TAG_VERSION=7.0.0
_TAG_REVISION=14
TERMUX_PKG_VERSION=${_TAG_VERSION}.${_TAG_REVISION}
-TERMUX_PKG_
BUILD_
REVISION=1
+TERMUX_PKG_REVISION=1
TERMUX_PKG_BUILD_IN_SRC=yes
TERMUX_PKG_DEPENDS="libexpat, libpng, libzopfli"
TERMUX_PKG_BUILD_IN_SRC=yes
TERMUX_PKG_DEPENDS="libexpat, libpng, libzopfli"
-TERMUX_PKG_CLANG=yes
termux_step_make_install () {
local _TAGNAME=${_TAG_VERSION}_r${_TAG_REVISION}
termux_step_make_install () {
local _TAGNAME=${_TAG_VERSION}_r${_TAG_REVISION}
@@
-38,7
+40,8
@@
termux_step_make_install () {
mkdir -p android-base
cd android-base
tar xf $ANDROID_BASE_INCLUDE_TARFILE
mkdir -p android-base
cd android-base
tar xf $ANDROID_BASE_INCLUDE_TARFILE
-
+ cd ../log
+ patch -p0 < $TERMUX_PKG_BUILDER_DIR/log.h.patch.txt
# Build libcutils:
mkdir -p $TERMUX_PKG_SRCDIR/{libcutils,androidfw}
# Build libcutils:
mkdir -p $TERMUX_PKG_SRCDIR/{libcutils,androidfw}
@@
-115,6
+118,7
@@
termux_step_make_install () {
tar xf $LIBUTILS_TARFILE
# From Android.mk:
#CallStack.cpp \
tar xf $LIBUTILS_TARFILE
# From Android.mk:
#CallStack.cpp \
+ #SystemClock.cpp \
commonSources="\
FileMap.cpp \
JenkinsHash.cpp \
commonSources="\
FileMap.cpp \
JenkinsHash.cpp \
@@
-129,7
+133,6
@@
termux_step_make_install () {
StopWatch.cpp \
String8.cpp \
String16.cpp \
StopWatch.cpp \
String8.cpp \
String16.cpp \
- SystemClock.cpp \
Threads.cpp \
Timers.cpp \
Tokenizer.cpp \
Threads.cpp \
Timers.cpp \
Tokenizer.cpp \
@@
-162,9
+165,9
@@
termux_step_make_install () {
rm -Rf $TERMUX_PREFIX/include/aosp/android-base
mv include/android-base $TERMUX_PREFIX/include/aosp
patch -p1 < $TERMUX_PKG_BUILDER_DIR/libbase-patch.txt
rm -Rf $TERMUX_PREFIX/include/aosp/android-base
mv include/android-base $TERMUX_PREFIX/include/aosp
patch -p1 < $TERMUX_PKG_BUILDER_DIR/libbase-patch.txt
+ #logging.cpp \
libbase_src_files="\
file.cpp \
libbase_src_files="\
file.cpp \
- logging.cpp \
parsenetaddress.cpp \
stringprintf.cpp \
strings.cpp \
parsenetaddress.cpp \
stringprintf.cpp \
strings.cpp \