sergiotarxz/termux-packages
sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

aapt: Update and tweak compiler flags

Browse Source
This commit is contained in:
Fredrik Fornwall 2016-10-06 17:20:34 -04:00
parent ccaf10fcc7
commit 0f4e6b84b1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/aapt/build.sh
View File

@ -1,9 +1,8 @@
TERMUX_PKG_HOMEPAGE=http://elinux.org/Android_aapt TERMUX_PKG_HOMEPAGE=http://elinux.org/Android_aapt
TERMUX_PKG_DESCRIPTION="Android Asset Packaging Tool" TERMUX_PKG_DESCRIPTION="Android Asset Packaging Tool"
_TAG_VERSION=7.0.0 _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_BUILD_REVISION=1
TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_BUILD_IN_SRC=yes
TERMUX_PKG_DEPENDS="libexpat, libpng, libzopfli" TERMUX_PKG_DEPENDS="libexpat, libpng, libzopfli"
TERMUX_PKG_CLANG=yes TERMUX_PKG_CLANG=yes
@ -48,8 +47,8 @@ termux_step_make_install () {
"https://android.googlesource.com/platform/system/core/+archive/android-$_TAGNAME/libcutils.tar.gz" \ "https://android.googlesource.com/platform/system/core/+archive/android-$_TAGNAME/libcutils.tar.gz" \
$LIBCUTILS_TARFILE $LIBCUTILS_TARFILE
tar xf $LIBCUTILS_TARFILE tar xf $LIBCUTILS_TARFILE
$CXX -isystem $AOSP_INCLUDE_DIR -c -o sockets.o sockets.cpp $CXX $CXXFLAGS -isystem $AOSP_INCLUDE_DIR -c -o sockets.o sockets.cpp
$CXX -isystem $AOSP_INCLUDE_DIR -c -o sockets_unix.o sockets_unix.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 sed -i 's%include <sys/_system_properties.h>%include <sys/system_properties.h>%' properties.c
# From Android.mk: # From Android.mk:
libcutils_common_sources="\ libcutils_common_sources="\
@ -80,7 +79,7 @@ termux_step_make_install () {
socket_network_client_unix.c \ socket_network_client_unix.c \
sockets_unix.o \ sockets_unix.o \
str_parms.c" str_parms.c"
$CC \ $CC $CFLAGS \
-Dchar16_t=uint16_t \ -Dchar16_t=uint16_t \
-std=c11 \ -std=c11 \
-isystem $AOSP_INCLUDE_DIR \ -isystem $AOSP_INCLUDE_DIR \
@ -138,6 +137,7 @@ termux_step_make_install () {
misc.cpp" misc.cpp"
$CXX $CXXFLAGS $CPPFLAGS $LDFLAGS \ $CXX $CXXFLAGS $CPPFLAGS $LDFLAGS \
-std=c++11 \ -std=c++11 \
'-DALOG_ASSERT(a,...)=' \
-Dtypeof=decltype \ -Dtypeof=decltype \
-isystem $TERMUX_PREFIX/include/aosp \ -isystem $TERMUX_PREFIX/include/aosp \
-isystem $SAFE_IOP_DIR/include \ -isystem $SAFE_IOP_DIR/include \
@ -171,7 +171,7 @@ termux_step_make_install () {
libbase_linux_src_files="\ libbase_linux_src_files="\
errors_unix.cpp" errors_unix.cpp"
# __USE_BSD for DEFFILEMODE to be defined by <sys/stat.h>. # __USE_BSD for DEFFILEMODE to be defined by <sys/stat.h>.
$CXX $CPPFLAGS -std=c++11 \ $CXX $CXXFLAGS $CPPFLAGS -std=c++11 \
-D__USE_BSD \ -D__USE_BSD \
-isystem $AOSP_INCLUDE_DIR \ -isystem $AOSP_INCLUDE_DIR \
$libbase_src_files $libbase_linux_src_files \ $libbase_src_files $libbase_linux_src_files \