diff options
author | David 'Digit' Turner <digit@android.com> | 2012-08-27 14:23:19 +0200 |
---|---|---|
committer | David 'Digit' Turner <digit@android.com> | 2012-08-27 14:23:19 +0200 |
commit | 7bbc211d514351896f4b8061bd0dcbf849f65903 (patch) | |
tree | 12571ca22851f6ae708f10946a63406744f1419e | |
parent | df2e9c859097e5bb6d7712aedb6847be16141312 (diff) | |
download | ndk-7bbc211d514351896f4b8061bd0dcbf849f65903.tar.gz |
Only take the last line of output for ndk-build DUMP_XXXX
This ensures that if Application.mk or Android.mk do print
something with $(info ...), it doesn't get injected into
the result of DUMP_XXX.
See https://groups.google.com/d/msg/android-ndk/-/ew0lTWGr1UEJ
for original discussion on android-ndk forum.
Change-Id: I4089aa7aa6a003a5953b93625f765b4988b35895
-rwxr-xr-x | ndk-gdb | 4 | ||||
-rwxr-xr-x | tests/run-tests.sh | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -102,7 +102,7 @@ get_build_var () if [ -z "$GNUMAKE" ] ; then GNUMAKE=make fi - $GNUMAKE --no-print-dir -f $ANDROID_NDK_ROOT/build/core/build-local.mk -C $PROJECT DUMP_$1 + $GNUMAKE --no-print-dir -f $ANDROID_NDK_ROOT/build/core/build-local.mk -C $PROJECT DUMP_$1 | tail -1 } get_build_var_for_abi () @@ -110,7 +110,7 @@ get_build_var_for_abi () if [ -z "$GNUMAKE" ] ; then GNUMAKE=make fi - $GNUMAKE --no-print-dir -f $ANDROID_NDK_ROOT/build/core/build-local.mk -C $PROJECT DUMP_$1 APP_ABI=$2 + $GNUMAKE --no-print-dir -f $ANDROID_NDK_ROOT/build/core/build-local.mk -C $PROJECT DUMP_$1 APP_ABI=$2 | tail -1 } # Used to run an awk script on the manifest diff --git a/tests/run-tests.sh b/tests/run-tests.sh index 9a0f1b797..2373865b4 100755 --- a/tests/run-tests.sh +++ b/tests/run-tests.sh @@ -396,7 +396,7 @@ get_build_var () if [ -z "$GNUMAKE" ] ; then GNUMAKE=make fi - $GNUMAKE --no-print-dir -f $NDK/build/core/build-local.mk -C $DIR DUMP_$1 + $GNUMAKE --no-print-dir -f $NDK/build/core/build-local.mk -C $DIR DUMP_$1 | tail -1 } build_project () |