summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/apk_test.gypi2
-rw-r--r--testing/android/native_test.gyp4
-rw-r--r--testing/android/native_test_apk.xml11
3 files changed, 14 insertions, 3 deletions
diff --git a/build/apk_test.gypi b/build/apk_test.gypi
index 519e789..26f31e9 100644
--- a/build/apk_test.gypi
+++ b/build/apk_test.gypi
@@ -61,6 +61,8 @@
'-DANDROID_SDK_VERSION=<(android_sdk_version)',
'--ant-args',
'-DANDROID_TOOLCHAIN=<(android_toolchain)',
+ '--ant-args',
+ '-DCHROMIUM_SRC=<(ant_build_out)/../..',
'--ant-compile'
],
}],
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.