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

Unified Diff: build/java_apk.gypi

Issue 191383008: android: Fix build more after 255971. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 9 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
Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index fc0955f21bcbe56d6aee214ca4a3944440f83acc..f9387cd2d6675bc98c5bfeddda2d52a99e1a205b 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -609,6 +609,7 @@
'<(DEPTH)/build/android/ant/create-test-jar.js',
'<(DEPTH)/build/android/gyp/util/build_utils.py',
'<(DEPTH)/build/android/gyp/ant.py',
+ '<(android_manifest_path)',
'>@(proguard_flags_paths)',
'<(instr_stamp)',
],
@@ -621,6 +622,7 @@
'python', '<(DEPTH)/build/android/gyp/ant.py',
'-quiet',
'-DADDITIONAL_SRC_DIRS=>(additional_src_dirs)',
+ '-DANDROID_MANIFEST=<(android_manifest_path)',
'-DANDROID_SDK_JAR=<(android_sdk_jar)',
'-DANDROID_SDK_ROOT=<(android_sdk_root)',
'-DANDROID_SDK_VERSION=<(android_sdk_version)',
@@ -695,6 +697,7 @@
'-DADDITIONAL_RES_DIRS=>(additional_res_dirs)',
'-DADDITIONAL_RES_PACKAGES=>(additional_res_packages)',
'-DADDITIONAL_R_TEXT_FILES=>(additional_R_text_files)',
+ '-DANDROID_MANIFEST=<(android_manifest_path)',
'-DANDROID_SDK_JAR=<(android_sdk_jar)',
'-DANDROID_SDK_ROOT=<(android_sdk_root)',
'-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
« build/android/ant/apk-obfuscate.xml ('K') | « build/android/ant/apk-package-resources.xml ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698