diff options
| author | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-13 13:59:20 +0000 |
|---|---|---|
| committer | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-13 13:59:20 +0000 |
| commit | dc0bf56506211a5dabc46e21977fcfb7060f400e (patch) | |
| tree | e92af7113346af9cde84488dae106b0a55e7af7d /testing | |
| parent | b0571c53e3c53bd90e3592541c7fc374f51098cc (diff) | |
| download | chromium_src-dc0bf56506211a5dabc46e21977fcfb7060f400e.zip chromium_src-dc0bf56506211a5dabc46e21977fcfb7060f400e.tar.gz chromium_src-dc0bf56506211a5dabc46e21977fcfb7060f400e.tar.bz2 | |
Android's native_tests.gyp should take WebKit's directory structure into account.
This broke the WebKit Chromium Android bot.
BUG=142322
Review URL: https://chromiumcodereview.appspot.com/10829291
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151257 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/android/native_test.gyp | 4 | ||||
| -rw-r--r-- | testing/android/native_test_apk.xml | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/testing/android/native_test.gyp b/testing/android/native_test.gyp index 38d2f39..28d8819 100644 --- a/testing/android/native_test.gyp +++ b/testing/android/native_test.gyp @@ -38,12 +38,16 @@ ], 'action': [ 'ant', + # TODO: All of these paths are absolute paths right now, while + # we really should be using relative paths for anything that is + # checked in to the Chromium tree (among which the SDK). '-DPRODUCT_DIR=<(ant_build_out)', '-DANDROID_SDK=<(android_sdk)', '-DANDROID_SDK_ROOT=<(android_sdk_root)', '-DANDROID_SDK_TOOLS=<(android_sdk_tools)', '-DANDROID_SDK_VERSION=<(android_sdk_version)', '-DANDROID_TOOLCHAIN=<(android_toolchain)', + '-DCHROMIUM_SRC=<(ant_build_out)/../..', '-buildfile', '<(DEPTH)/testing/android/native_test_apk.xml', ] diff --git a/testing/android/native_test_apk.xml b/testing/android/native_test_apk.xml index 64d0e88..03679882 100644 --- a/testing/android/native_test_apk.xml +++ b/testing/android/native_test_apk.xml @@ -12,10 +12,15 @@ found in the LICENSE file. </description> <!-- - TODO(yfriedman): This target can be invoked from multiple depths. So we use ${PRODUCT_DIR} to normalize the paths. This could be cleaned up. + TODO(beverloo): Remove this property when all gyp files (also those in + WebKit) define the CHROMIUM_SRC property. This works because properties + in ant files are immutable. --> - <import file="${PRODUCT_DIR}/../../build/android/ant/common.xml"/> - <import file="${PRODUCT_DIR}/../../build/android/ant/sdk-targets.xml"/> + <property name="CHROMIUM_SRC" value="${PRODUCT_DIR}/../.." /> + + <import file="${CHROMIUM_SRC}/build/android/ant/common.xml"/> + <import file="${CHROMIUM_SRC}/build/android/ant/sdk-targets.xml"/> + <!-- TODO(yfriedman): Remove the need to specify this. We should generate the packages in a way such that it's not required. |