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

Unified Diff: base/base.gyp

Issue 1581563003: [Android] Rework multidex and enable multidex for unit_tests_apk. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix junit tests Created 4 years, 11 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: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index dc484f4a4a62b0d2aa9804b29ba98c235dc7f7a3..94a1d49258572d0833fca927e599874541efca0f 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': [
- '--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' ],
},
{
@@ -1583,6 +1588,7 @@
'target_name': 'base_junit_test_support',
'type': 'none',
'dependencies': [
+ 'base_multidex_gen',
'../testing/android/junit/junit_test.gyp:junit_test_support',
'../third_party/android_tools/android_tools.gyp:android_support_multidex_javalib',
],

Powered by Google App Engine
This is Rietveld 408576698