Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(665)

Unified Diff: testing/android/native_test_apk.xml

Issue 10830012: [Android] Add chrome_java target for building Java code in the chromium layer. (Closed) Base URL: http://git.chromium.org/chromium/src.git@reland
Patch Set: fix java build error Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « testing/android/native_test.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/android/native_test_apk.xml
diff --git a/testing/android/native_test_apk.xml b/testing/android/native_test_apk.xml
index 444cf932b172da4818a997d59a834d9ccd778d34..64d0e886a2496ca1520f81000c61a3a11ec4fef4 100644
--- a/testing/android/native_test_apk.xml
+++ b/testing/android/native_test_apk.xml
@@ -11,25 +11,25 @@ found in the LICENSE file.
Building native test runner ChromeNativeTests_replaceme.apk
</description>
- <property environment="env"/>
- <property name="sdk.dir" location="${env.ANDROID_SDK_ROOT}"/>
- <property name="sdk.version" value="${env.ANDROID_SDK_VERSION}"/>
- <property name="toolchain.dir" location="${env.ANDROID_TOOLCHAIN}"/>
- <property name="src" location="."/>
- <property name="source.dir" location="java/src"/>
+ <!--
+ TODO(yfriedman): This target can be invoked from multiple depths. So we use ${PRODUCT_DIR} to normalize the paths. This could be cleaned up.
+ -->
+ <import file="${PRODUCT_DIR}/../../build/android/ant/common.xml"/>
+ <import file="${PRODUCT_DIR}/../../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.
+ -->
+ <property name="source.absolute.dir" value="java/src"/>
+ <path id="javac.custom.classpath">
+ <pathelement location="${ANDROID_SDK}/android.jar" />
+ </path>
<property name="target.abi" value="${APP_ABI}"/>
- <property name="target" value="android-${env.ANDROID_SDK_VERSION}"/>
<path id="native.libs.gdbserver">
<fileset file="${toolchain.dir}/../../gdbserver"/>
</path>
- <condition property="location.base"
- value="${sdk.dir}"
- else="${sdk.dir}/platforms/android-${sdk.version}">
- <isset property="env.ANDROID_BUILD_TOP"/>
- </condition>
-
<!-- We expect PRODUCT_DIR to be set like the gyp var
(e.g. $ROOT/out/Debug) -->
<fail message="PRODUCT_DIR env var not set?">
« no previous file with comments | « testing/android/native_test.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698