aapt: Fix underlinking
This commit is contained in:
parent
1cfe4180d6
commit
c77d46b2f6
|
@ -5,6 +5,7 @@ TERMUX_PKG_MAINTAINER="@termux"
|
||||||
_TAG_VERSION=13.0.0
|
_TAG_VERSION=13.0.0
|
||||||
_TAG_REVISION=6
|
_TAG_REVISION=6
|
||||||
TERMUX_PKG_VERSION=${_TAG_VERSION}.${_TAG_REVISION}
|
TERMUX_PKG_VERSION=${_TAG_VERSION}.${_TAG_REVISION}
|
||||||
|
TERMUX_PKG_REVISION=1
|
||||||
TERMUX_PKG_SRCURL=(https://android.googlesource.com/platform/frameworks/base
|
TERMUX_PKG_SRCURL=(https://android.googlesource.com/platform/frameworks/base
|
||||||
https://android.googlesource.com/platform/system/core
|
https://android.googlesource.com/platform/system/core
|
||||||
https://android.googlesource.com/platform/system/libbase
|
https://android.googlesource.com/platform/system/libbase
|
||||||
|
@ -102,12 +103,21 @@ termux_step_make() {
|
||||||
-I$LIBLOG_INCDIR
|
-I$LIBLOG_INCDIR
|
||||||
-I$CORE_INCDIR"
|
-I$CORE_INCDIR"
|
||||||
|
|
||||||
|
# Build libbase:
|
||||||
|
cd $LIBBASE_SRCDIR
|
||||||
|
for f in $libbase_sources; do
|
||||||
|
$CXX $CXXFLAGS $CPPFLAGS $f -c
|
||||||
|
done
|
||||||
|
$CXX $CXXFLAGS *.o -shared $LDFLAGS \
|
||||||
|
-o $_TMP_LIBDIR/libandroid-base.so
|
||||||
|
|
||||||
# Build libcutils:
|
# Build libcutils:
|
||||||
cd $LIBCUTILS_SRCDIR
|
cd $LIBCUTILS_SRCDIR
|
||||||
for f in $libcutils_sources; do
|
for f in $libcutils_sources; do
|
||||||
$CXX $CXXFLAGS $CPPFLAGS $f -c
|
$CXX $CXXFLAGS $CPPFLAGS $f -c
|
||||||
done
|
done
|
||||||
$CC $CFLAGS *.o -shared $LDFLAGS \
|
$CXX $CXXFLAGS *.o -shared $LDFLAGS \
|
||||||
|
-landroid-base \
|
||||||
-o $_TMP_LIBDIR/libandroid-cutils.so
|
-o $_TMP_LIBDIR/libandroid-cutils.so
|
||||||
|
|
||||||
# Build libutils:
|
# Build libutils:
|
||||||
|
@ -116,16 +126,10 @@ termux_step_make() {
|
||||||
$CXX $CXXFLAGS $CPPFLAGS $f -c
|
$CXX $CXXFLAGS $CPPFLAGS $f -c
|
||||||
done
|
done
|
||||||
$CXX $CXXFLAGS *.o -shared $LDFLAGS \
|
$CXX $CXXFLAGS *.o -shared $LDFLAGS \
|
||||||
|
-landroid-base \
|
||||||
-landroid-cutils \
|
-landroid-cutils \
|
||||||
-o $_TMP_LIBDIR/libandroid-utils.so
|
-o $_TMP_LIBDIR/libandroid-utils.so
|
||||||
|
|
||||||
# Build libbase:
|
|
||||||
cd $LIBBASE_SRCDIR
|
|
||||||
for f in $libbase_sources; do
|
|
||||||
$CXX $CXXFLAGS $CPPFLAGS $f -c
|
|
||||||
done
|
|
||||||
$CXX $CXXFLAGS *.o -shared $LDFLAGS \
|
|
||||||
-o $_TMP_LIBDIR/libandroid-base.so
|
|
||||||
|
|
||||||
# Build libziparchive:
|
# Build libziparchive:
|
||||||
cd $LIBZIPARCHIVE_SRCDIR
|
cd $LIBZIPARCHIVE_SRCDIR
|
||||||
|
@ -149,7 +153,9 @@ termux_step_make() {
|
||||||
$CXX $CXXFLAGS *.o -shared $LDFLAGS \
|
$CXX $CXXFLAGS *.o -shared $LDFLAGS \
|
||||||
-landroid-base \
|
-landroid-base \
|
||||||
-landroid-cutils \
|
-landroid-cutils \
|
||||||
|
-landroid-utils \
|
||||||
-landroid-ziparchive \
|
-landroid-ziparchive \
|
||||||
|
-lz \
|
||||||
-o $_TMP_LIBDIR/libandroid-fw.so
|
-o $_TMP_LIBDIR/libandroid-fw.so
|
||||||
|
|
||||||
CPPFLAGS+=" -I$ANDROIDFW_SRCDIR/include"
|
CPPFLAGS+=" -I$ANDROIDFW_SRCDIR/include"
|
||||||
|
|
Loading…
Reference in New Issue