~mdw
/
termux-packages
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mariadb: Fix building with unified headers
[termux-packages]
/
packages
/
aapt
/
build.sh
diff --git
a/packages/aapt/build.sh
b/packages/aapt/build.sh
index
066b09c
..
14d9502
100644
(file)
--- a/
packages/aapt/build.sh
+++ b/
packages/aapt/build.sh
@@
-1,11
+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
TERMUX_PKG_HOMEPAGE=http://elinux.org/Android_aapt
TERMUX_PKG_DESCRIPTION="Android Asset Packaging Tool"
_TAG_VERSION=7.0.0
-_TAG_REVISION=
6
+_TAG_REVISION=
14
TERMUX_PKG_VERSION=${_TAG_VERSION}.${_TAG_REVISION}
TERMUX_PKG_VERSION=${_TAG_VERSION}.${_TAG_REVISION}
+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}
@@
-37,8
+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}
@@
-48,8
+51,9
@@
termux_step_make_install () {
"https://android.googlesource.com/platform/system/core/+archive/android-$_TAGNAME/libcutils.tar.gz" \
$LIBCUTILS_TARFILE
tar xf $LIBCUTILS_TARFILE
"https://android.googlesource.com/platform/system/core/+archive/android-$_TAGNAME/libcutils.tar.gz" \
$LIBCUTILS_TARFILE
tar xf $LIBCUTILS_TARFILE
- $CXX -isystem $AOSP_INCLUDE_DIR -c -o sockets.o sockets.cpp
- $CXX -isystem $AOSP_INCLUDE_DIR -c -o sockets_unix.o sockets_unix.cpp
+ patch -p0 < $TERMUX_PKG_BUILDER_DIR/libcutils-patch.txt
+ $CXX $CXXFLAGS -isystem $AOSP_INCLUDE_DIR -c -o sockets.o sockets.cpp
+ $CXX $CXXFLAGS -isystem $AOSP_INCLUDE_DIR -c -o sockets_unix.o sockets_unix.cpp
sed -i 's%include <sys/_system_properties.h>%include <sys/system_properties.h>%' properties.c
# From Android.mk:
libcutils_common_sources="\
sed -i 's%include <sys/_system_properties.h>%include <sys/system_properties.h>%' properties.c
# From Android.mk:
libcutils_common_sources="\
@@
-80,7
+84,7
@@
termux_step_make_install () {
socket_network_client_unix.c \
sockets_unix.o \
str_parms.c"
socket_network_client_unix.c \
sockets_unix.o \
str_parms.c"
- $CC \
+ $CC
$CFLAGS
\
-Dchar16_t=uint16_t \
-std=c11 \
-isystem $AOSP_INCLUDE_DIR \
-Dchar16_t=uint16_t \
-std=c11 \
-isystem $AOSP_INCLUDE_DIR \
@@
-115,6
+119,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
+134,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 \
@@
-138,6
+142,7
@@
termux_step_make_install () {
misc.cpp"
$CXX $CXXFLAGS $CPPFLAGS $LDFLAGS \
-std=c++11 \
misc.cpp"
$CXX $CXXFLAGS $CPPFLAGS $LDFLAGS \
-std=c++11 \
+ '-DALOG_ASSERT(a,...)=' \
-Dtypeof=decltype \
-isystem $TERMUX_PREFIX/include/aosp \
-isystem $SAFE_IOP_DIR/include \
-Dtypeof=decltype \
-isystem $TERMUX_PREFIX/include/aosp \
-isystem $SAFE_IOP_DIR/include \
@@
-161,9
+166,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 \
@@
-171,7
+176,7
@@
termux_step_make_install () {
libbase_linux_src_files="\
errors_unix.cpp"
# __USE_BSD for DEFFILEMODE to be defined by <sys/stat.h>.
libbase_linux_src_files="\
errors_unix.cpp"
# __USE_BSD for DEFFILEMODE to be defined by <sys/stat.h>.
- $CXX $CPPFLAGS -std=c++11 \
+ $CXX $C
XXFLAGS $C
PPFLAGS -std=c++11 \
-D__USE_BSD \
-isystem $AOSP_INCLUDE_DIR \
$libbase_src_files $libbase_linux_src_files \
-D__USE_BSD \
-isystem $AOSP_INCLUDE_DIR \
$libbase_src_files $libbase_linux_src_files \
@@
-198,6
+203,8
@@
termux_step_make_install () {
-isystem $AOSP_INCLUDE_DIR \
$libziparchive_source_files \
-landroid-base \
-isystem $AOSP_INCLUDE_DIR \
$libziparchive_source_files \
-landroid-base \
+ -landroid-utils \
+ -lz \
-llog \
-shared \
-o $TERMUX_PREFIX/lib/libandroid-ziparchive.so
-llog \
-shared \
-o $TERMUX_PREFIX/lib/libandroid-ziparchive.so
@@
-225,19
+232,20
@@
termux_step_make_install () {
ZipFileRO.cpp \
ZipUtils.cpp"
sed -i 's%#include <binder/TextOutput.h>%%' ResourceTypes.cpp
ZipFileRO.cpp \
ZipUtils.cpp"
sed -i 's%#include <binder/TextOutput.h>%%' ResourceTypes.cpp
- $CXX $CXXFLAGS $LDFLAGS -isystem $AOSP_INCLUDE_DIR \
+ if [ -z "${TERMUX_UNIFIED_HEADERS:=""}" ]; then
+ CPPFLAGS+=" -DACONFIGURATION_SCREENROUND_ANY=0x00 -DACONFIGURATION_SCREENROUND_NO=0x1 -DACONFIGURATION_SCREENROUND_YES=0x2 -DACONFIGURATION_SCREEN_ROUND=0x8000"
+ fi
+ $CXX $CXXFLAGS $CPPFLAGS $LDFLAGS -isystem $AOSP_INCLUDE_DIR \
-std=c++11 \
$commonSources \
-std=c++11 \
$commonSources \
- -
DACONFIGURATION_SCREENROUND_ANY=0x00
\
- -
DACONFIGURATION_SCREENROUND_NO=0x1
\
- -
DACONFIGURATION_SCREENROUND_YES=0x2
\
- -
DACONFIGURATION_SCREEN_ROUND=0x8000
\
- -l
android-cutils -landroid-ziparchive
\
+ -
landroid-cutils
\
+ -
landroid-utils
\
+ -
landroid-ziparchive
\
+ -
llog
\
+ -l
z
\
-shared \
-o $TERMUX_PREFIX/lib/libandroid-fw.so
-shared \
-o $TERMUX_PREFIX/lib/libandroid-fw.so
-
-
# Build aapt:
AAPT_TARFILE=$TERMUX_PKG_CACHEDIR/aapt_${_TAGNAME}.tar.gz
test ! -f $AAPT_TARFILE && termux_download \
# Build aapt:
AAPT_TARFILE=$TERMUX_PKG_CACHEDIR/aapt_${_TAGNAME}.tar.gz
test ! -f $AAPT_TARFILE && termux_download \
@@
-246,15
+254,12
@@
termux_step_make_install () {
mkdir $TERMUX_PKG_SRCDIR/aapt
cd $TERMUX_PKG_SRCDIR/aapt
tar xf $AAPT_TARFILE
mkdir $TERMUX_PKG_SRCDIR/aapt
cd $TERMUX_PKG_SRCDIR/aapt
tar xf $AAPT_TARFILE
+ sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $TERMUX_PKG_BUILDER_DIR/aapt-Main.cpp.patch.txt | patch -p1
$CXX $CXXFLAGS $CPPFLAGS $LDFLAGS \
-std=c++11 \
-DANDROID_SMP=1 \
-DNDEBUG=1 \
-DHAVE_ENDIAN_H=1 -DHAVE_POSIX_FILEMAP=1 -DHAVE_OFF64_T=1 -DHAVE_SYS_SOCKET_H=1 -DHAVE_PTHREADS=1 \
$CXX $CXXFLAGS $CPPFLAGS $LDFLAGS \
-std=c++11 \
-DANDROID_SMP=1 \
-DNDEBUG=1 \
-DHAVE_ENDIAN_H=1 -DHAVE_POSIX_FILEMAP=1 -DHAVE_OFF64_T=1 -DHAVE_SYS_SOCKET_H=1 -DHAVE_PTHREADS=1 \
- -DACONFIGURATION_SCREENROUND_ANY=0x00 \
- -DACONFIGURATION_SCREENROUND_NO=0x1 \
- -DACONFIGURATION_SCREENROUND_YES=0x2 \
- -DACONFIGURATION_SCREEN_ROUND=0x8000 \
-isystem $AOSP_INCLUDE_DIR \
*.cpp \
-landroid-cutils -landroid-utils -landroid-fw -landroid-ziparchive \
-isystem $AOSP_INCLUDE_DIR \
*.cpp \
-landroid-cutils -landroid-utils -landroid-fw -landroid-ziparchive \
@@
-284,7
+289,16
@@
termux_step_make_install () {
-o $TERMUX_PREFIX/bin/zipalign
-o $TERMUX_PREFIX/bin/zipalign
-
# Remove this one for now:
rm -Rf $AOSP_INCLUDE_DIR
# Remove this one for now:
rm -Rf $AOSP_INCLUDE_DIR
+
+ # Create an android.jar with AndroidManifest.xml and resources.arsc:
+ cd $TERMUX_PKG_TMPDIR
+ rm -rf android-jar
+ mkdir android-jar
+ cd android-jar
+ cp $ANDROID_HOME/platforms/android-25/android.jar .
+ unzip -q android.jar
+ mkdir -p $TERMUX_PREFIX/share/aapt
+ zip -q $TERMUX_PREFIX/share/aapt/android.jar AndroidManifest.xml resources.arsc
}
}