Index: base/base.gyp |
diff --git a/base/base.gyp b/base/base.gyp |
index dc484f4a4a62b0d2aa9804b29ba98c235dc7f7a3..e384bc4f1d930d7103e13135929a842c81a1d70e 100644 |
--- a/base/base.gyp |
+++ b/base/base.gyp |
@@ -1489,9 +1489,6 @@ |
'variables': { |
'package_name': 'org/chromium/base/multidex', |
'template_deps': [], |
- 'additional_gcc_preprocess_options': [ |
Nico
2016/01/12 03:42:12
can this https://code.google.com/p/chromium/codese
jbudorick
2016/01/12 04:48:11
it can. removed.
|
- '--defines', 'MULTIDEX_CONFIGURATION_<(CONFIGURATION_NAME)', |
- ], |
}, |
'includes': ['../build/android/java_cpp_template.gypi'], |
}, |
@@ -1510,7 +1507,10 @@ |
'type': 'none', |
'variables': { |
'java_in_dir': 'android/java', |
- 'jar_excluded_classes': [ '*/NativeLibraries.class' ], |
+ 'jar_excluded_classes': [ |
+ '*/ChromiumMultiDex.class', |
+ '*/NativeLibraries.class', |
+ ], |
}, |
'dependencies': [ |
'base_java_application_state', |
@@ -1522,6 +1522,11 @@ |
'../third_party/android_tools/android_tools.gyp:android_support_multidex_javalib', |
'../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib', |
], |
+ 'all_dependent_settings': { |
+ 'variables': { |
+ 'generate_multidex_config': 1, |
+ }, |
+ }, |
'includes': [ '../build/java.gypi' ], |
}, |
{ |