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

Unified Diff: build/java_apk.gypi

Issue 11017016: Add support for building apk in release (Closed) Base URL: http://git.chromium.org/chromium/src.git@apk_combine
Patch Set: Created 8 years, 2 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/chromium-apk.xml ('k') | chrome/android/testshell/java/AndroidManifest.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index 4aa6ea8da635644a573400a5362ddf0a6470ab41..533016f9674825ce5a65236c99df6d669517e20a 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -77,6 +77,8 @@
'>@(additional_input_paths)',
],
'outputs': [
+ # TODO(cjhopman): Apks are built with a -debug suffix even when they are
+ # built in release. This should be fixed.
'<(PRODUCT_DIR)/apks/<(apk_name)-debug.apk',
],
'action': [
@@ -102,7 +104,11 @@
'-Dbasedir=<(java_in_dir)',
'-buildfile',
- '<(DEPTH)/build/android/ant/chromium-apk.xml'
+ '<(DEPTH)/build/android/ant/chromium-apk.xml',
+
+ # Specify CONFIGURATION_NAME as the target for ant to build. The
+ # buildfile will then build the appropriate SDK tools target.
+ '<(CONFIGURATION_NAME)',
]
},
],
« no previous file with comments | « build/android/ant/chromium-apk.xml ('k') | chrome/android/testshell/java/AndroidManifest.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698