Fix the gdb path for NDK-r8b.

- Removed android.toolchain property. - Added android.gdbserver property. - Changed property-location to check the both file and directory's existence. TBR=jam BUG= Review URL: https://chromiumcodereview.appspot.com/10823435 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155108 0039d316-1c4b-4281-b951-d872f2087c98
Denger-Network · Sep 6, 2012 · 8eecfc6 · 8eecfc6
1 parent e890e09
commit 8eecfc6
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 12 deletions.
diff --git a/build/android/ant/common.xml b/build/android/ant/common.xml
@@ -53,7 +53,7 @@
         <condition>
           <and>
             <equals arg1="@{check-exists}" arg2="true"/>
-            <not><available type="dir" file="@{location}"/></not>
+            <not><available file="@{location}"/></not>
           </and>
         </condition>
       </fail>
@@ -74,5 +74,5 @@
   <property-location name="sdk.dir" location="${ANDROID_SDK_ROOT}"/>
   <property-value name="target" value="android-${ANDROID_SDK_VERSION}"/>
   <property name="source.dir" location="src"/>
-  <property-location name="toolchain.dir" location="${ANDROID_TOOLCHAIN}"/>
+  <property-location name="android.gdbserver" location="${ANDROID_GDBSERVER}"/>
 </project>
diff --git a/build/android/gdb_apk b/build/android/gdb_apk
@@ -158,7 +158,7 @@ file ${app_process}
 target remote :4321
 EOF
 
-gdb=$(echo $ANDROID_TOOLCHAIN/*gdb)
+gdb=$(echo $ANDROID_TOOLCHAIN/../../linux-x86/bin/*gdb)
 if [[ ! -f ${gdb} ]] ; then
   echo "Wow no gdb in env var ANDROID_TOOLCHAIN which is $ANDROID_TOOLCHAIN"
   exit 4

diff --git a/build/apk_test.gypi b/build/apk_test.gypi
@@ -61,8 +61,6 @@
               '--ant-args',
               '-DANDROID_SDK_VERSION=<(android_sdk_version)',
               '--ant-args',
-              '-DANDROID_TOOLCHAIN=<(android_toolchain)',
-              '--ant-args',
               '-DANDROID_GDBSERVER=<(android_gdbserver)',
               '--ant-args',
               '-DCHROMIUM_SRC=<(ant_build_out)/../..',

diff --git a/build/java.gypi b/build/java.gypi
@@ -60,7 +60,6 @@
         '-DANDROID_SDK_ROOT=<(android_sdk_root)',
         '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
         '-DANDROID_SDK_VERSION=<(android_sdk_version)',
-        '-DANDROID_TOOLCHAIN=<(android_toolchain)',
         '-DANDROID_GDBSERVER=<(android_gdbserver)',
         '-Dbasedir=<(java_in_dir)',
         '-buildfile',

diff --git a/content/content_shell.gypi b/content/content_shell.gypi
@@ -640,7 +640,6 @@
                 '-DANDROID_SDK_ROOT=<(android_sdk_root)',
                 '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
                 '-DANDROID_SDK_VERSION=<(android_sdk_version)',
-                '-DANDROID_TOOLCHAIN=<(android_toolchain)',
                 '-DANDROID_GDBSERVER=<(android_gdbserver)',
                 '-DCONFIGURATION_NAME=<(CONFIGURATION_NAME)',
                 '-buildfile',

diff --git a/content/content_tests.gypi b/content/content_tests.gypi
@@ -834,7 +834,6 @@
                 '-DANDROID_SDK_ROOT=<(android_sdk_root)',
                 '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
                 '-DANDROID_SDK_VERSION=<(android_sdk_version)',
-                '-DANDROID_TOOLCHAIN=<(android_toolchain)',
                 '-DANDROID_GDBSERVER=<(android_gdbserver)',
                 '-buildfile',
                 '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk.xml',

diff --git a/content/shell/android/java/content_shell_apk.xml b/content/shell/android/java/content_shell_apk.xml
@@ -23,7 +23,7 @@
   <property name="gen.absolute.dir" value="${out.dir}/gen"/>
   <property name="jar.libs.dir" value="${out.dir}/java/libs"/>
   <path id="native.libs.gdbserver">
-    <fileset file="${toolchain.dir}/../../gdbserver"/>
+    <fileset file="${android.gdbserver}"/>
   </path>
   <property name="native.libs.absolute.dir" location="${out.dir}/libs"/>
   <property name="asset.absolute.dir" location="${out.dir}/assets"/>

diff --git a/content/shell/android/javatests/content_shell_test_apk.xml b/content/shell/android/javatests/content_shell_test_apk.xml
@@ -17,7 +17,7 @@
   <property name="resource.absolute.dir" value="../res"/>
   <property name="gen.absolute.dir" value="${out.dir}/gen"/>
   <path id="native.libs.gdbserver">
-    <fileset file="${toolchain.dir}/../../gdbserver"/>
+    <fileset file="${android.gdbserver}"/>
   </path>
   <property name="native.libs.absolute.dir" location="${out.dir}/libs" />
   <property name="asset.absolute.dir" location="${out.dir}/assets" />

diff --git a/testing/android/native_test.gyp b/testing/android/native_test.gyp
@@ -46,7 +46,6 @@
                 '-DANDROID_SDK_ROOT=<(android_sdk_root)',
                 '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
                 '-DANDROID_SDK_VERSION=<(android_sdk_version)',
-                '-DANDROID_TOOLCHAIN=<(android_toolchain)',
                 '-DANDROID_GDBSERVER=<(android_gdbserver)',
                 '-DCHROMIUM_SRC=<(ant_build_out)/../..',
                 '-buildfile',

diff --git a/testing/android/native_test_apk.xml b/testing/android/native_test_apk.xml
@@ -32,7 +32,7 @@ found in the LICENSE file.
   <property name="target.abi" value="${APP_ABI}"/>
 
   <path id="native.libs.gdbserver">
-    <fileset file="${toolchain.dir}/../../gdbserver"/>
+    <fileset file="${android.gdbserver}"/>
   </path>
 
   <!-- We expect PRODUCT_DIR to be set like the gyp var