diff options
| author | Dan Albert <danalbert@google.com> | 2015-10-15 21:47:42 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-10-16 10:20:52 -0700 |
| commit | ed791d17fac4a430aa4e37501d6f8157839c3a6f (patch) | |
| tree | 27c92dedc21d9d72f8e90c2e5e9fee546fc70dae /sources | |
| parent | 91961bdd0c84ebcf5272753335f766df216b3021 (diff) | |
| download | ndk-ed791d17fac4a430aa4e37501d6f8157839c3a6f.tar.gz | |
One gnustl to rule them all.
Instead of separately packaging the headers and libs for each ABI, put
all of gnustl into a single package.
Bug: http://b/24992609
Change-Id: If9cacde42cb542ab170349046a37bec7f94d9790
Diffstat (limited to 'sources')
| -rwxr-xr-x | sources/cxx-stl/gnu-libstdc++/build-gnu-libstdc++.sh | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/sources/cxx-stl/gnu-libstdc++/build-gnu-libstdc++.sh b/sources/cxx-stl/gnu-libstdc++/build-gnu-libstdc++.sh index 3952db917..33c00513f 100755 --- a/sources/cxx-stl/gnu-libstdc++/build-gnu-libstdc++.sh +++ b/sources/cxx-stl/gnu-libstdc++/build-gnu-libstdc++.sh @@ -426,17 +426,11 @@ done # If needed, package files into tarballs if [ -n "$PACKAGE_DIR" ] ; then for VERSION in $GCC_VERSION_LIST; do - # First, the headers as a single package for a given gcc version - PACKAGE="$PACKAGE_DIR/gnu-libstdc++-headers-$VERSION.tar.bz2" - dump "Packaging: $PACKAGE" - pack_archive "$PACKAGE" "$NDK_DIR" "$GNUSTL_SUBDIR/include" - - # Then, one package per version/ABI for libraries + FILES="$GNUSTL_SUBDIR/include" for ABI in $ABIS; do if [ ! -d "$NDK_DIR/$GNUSTL_SUBDIR/libs/$ABI" ]; then continue fi - FILES="" case "$ABI" in x86_64) MULTILIB="include/32/bits include/x32/bits @@ -469,15 +463,12 @@ if [ -n "$PACKAGE_DIR" ] ; then FILES="$FILES $THUMB_FILE" fi done - PACKAGE="$PACKAGE_DIR/gnu-libstdc++-libs-$VERSION-$ABI" - if [ "$WITH_DEBUG_INFO" ]; then - PACKAGE="${PACKAGE}-g" - fi - PACKAGE="${PACKAGE}.tar.bz2" - dump "Packaging: $PACKAGE" - pack_archive "$PACKAGE" "$NDK_DIR" "$FILES" - fail_panic "Could not package $ABI GNU libstdc++ binaries!" done + + PACKAGE="$PACKAGE_DIR/gnustl-${VERSION}.tar.bz2" + dump "Packaging: $PACKAGE" + pack_archive "$PACKAGE" "$NDK_DIR" "$FILES" + fail_panic "Could not package GNU libstdc++ binaries!" done fi |