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

Unified Diff: base/base.gyp

Issue 1408163009: [Android] Enable multidex for debug builds of ChromePublic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: actually remove --tested-apk-multidex-configuration-path Created 5 years, 1 month 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: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index be5051534d8c1d6c790ab83bba42b2d4fade2929..75b9952352b669d33128ea19adf342362fd8cd10 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -1460,6 +1460,21 @@
'includes': [ '../build/android/java_cpp_template.gypi' ],
},
{
+ 'target_name': 'base_multidex_gen',
+ 'type': 'none',
+ 'sources': [
+ 'android/java/templates/ChromiumMultiDex.template',
+ ],
+ 'variables': {
+ 'package_name': 'org/chromium/base/multidex',
+ 'template_deps': [],
+ 'additional_gcc_preprocess_options': [
Yaron 2015/11/12 22:15:20 i thought you could use jinja but this works too.
jbudorick 2015/11/12 22:20:49 I imagine I could, but I'm more familiar with the
+ '--defines', 'CONFIGURATION_NAME_<(CONFIGURATION_NAME)',
+ ],
+ },
+ 'includes': ['../build/android/java_cpp_template.gypi'],
+ },
+ {
# GN: //base:base_android_java_enums_srcjar
'target_name': 'base_java_library_process_type',
'type': 'none',
@@ -1481,6 +1496,7 @@
'base_java_library_load_from_apk_status_codes',
'base_java_library_process_type',
'base_java_memory_pressure_level',
+ 'base_multidex_gen',
'base_native_libraries_gen',
'../third_party/android_tools/android_tools.gyp:android_support_multidex_javalib',
'../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',

Powered by Google App Engine
This is Rietveld 408576698