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

Unified Diff: build/apk_test.gypi

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 | « build/android/ant/sdk-targets.xml ('k') | build/java.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/apk_test.gypi
diff --git a/build/apk_test.gypi b/build/apk_test.gypi
index 557499b1220b651371b2086c5f83e9107d92923d..bd7410541dcea85fe50756c74760d3d259d0192e 100644
--- a/build/apk_test.gypi
+++ b/build/apk_test.gypi
@@ -45,9 +45,20 @@
'<(PRODUCT_DIR)/<(test_suite_name)_apk',
'--app_abi',
'<(android_app_abi)',
+ '--sdk-build=<(sdk_build)',
'--ant-args',
'-DPRODUCT_DIR=<(ant_build_out)',
- '--sdk-build=<(sdk_build)',
+ '--ant-args',
+ '-DANDROID_SDK=<(android_sdk)',
+ '--ant-args',
+ '-DANDROID_SDK_ROOT=<(android_sdk_root)',
+ '--ant-args',
+ '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
+ '--ant-args',
+ '-DANDROID_SDK_VERSION=<(android_sdk_version)',
+ '--ant-args',
+ '-DANDROID_TOOLCHAIN=<(android_toolchain)',
+ '--ant-compile'
],
}],
}], # 'OS == "android" and gtest_target_type == "shared_library"
« no previous file with comments | « build/android/ant/sdk-targets.xml ('k') | build/java.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698