diff options
| author | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-06 02:53:53 +0000 |
|---|---|---|
| committer | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-06 02:53:53 +0000 |
| commit | 8eecfc6f306180fcfd73241cfb59aa1453c49f54 (patch) | |
| tree | 23dc8a08553a2f6cf2f992891dc28ff0db4d74e6 /testing/android | |
| parent | e890e09d9d641818f91237fa9ae0f528a39536d5 (diff) | |
| download | chromium_src-8eecfc6f306180fcfd73241cfb59aa1453c49f54.zip chromium_src-8eecfc6f306180fcfd73241cfb59aa1453c49f54.tar.gz chromium_src-8eecfc6f306180fcfd73241cfb59aa1453c49f54.tar.bz2 | |
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
Diffstat (limited to 'testing/android')
| -rw-r--r-- | testing/android/native_test.gyp | 1 | ||||
| -rw-r--r-- | testing/android/native_test_apk.xml | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/testing/android/native_test.gyp b/testing/android/native_test.gyp index b0c6be7..3a9a7d5 100644 --- 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 index 03679882..b410bc2 100644 --- 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 |