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

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: fix gn build 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
« no previous file with comments | « base/android/java/templates/ChromiumMultiDex.template ('k') | build/android/gyp/apk_obfuscate.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index be5051534d8c1d6c790ab83bba42b2d4fade2929..e8d449fffbb6de1f046fdb440038741e816c0247 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -1460,6 +1460,22 @@
'includes': [ '../build/android/java_cpp_template.gypi' ],
},
{
+ # GN: //base:base_multidex_gen
+ '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': [
+ '--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 +1497,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',
« no previous file with comments | « base/android/java/templates/ChromiumMultiDex.template ('k') | build/android/gyp/apk_obfuscate.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698