From 7bbc211d514351896f4b8061bd0dcbf849f65903 Mon Sep 17 00:00:00 2001
From: David 'Digit' Turner <digit@android.com>
Date: Mon, 27 Aug 2012 14:23:19 +0200
Subject: 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
---
 ndk-gdb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ndk-gdb')

diff --git a/ndk-gdb b/ndk-gdb
index 9434e50bf..f7a0c396c 100755
--- a/ndk-gdb
+++ b/ndk-gdb
@@ -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
-- 
cgit v1.2.3