diff options
| author | wnwen <wnwen@chromium.org> | 2016-02-16 13:29:50 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-16 21:30:49 +0000 |
| commit | b0d6314305ddd99c0808a0a41e90b7feb89a79ea (patch) | |
| tree | 9603dd0376ee827d52c342a7366facac5063ccdd /base/base.gyp | |
| parent | f91208aa70fdf7ff84cb0d7cb99bf9b6fa9af294 (diff) | |
| download | chromium_src-b0d6314305ddd99c0808a0a41e90b7feb89a79ea.zip chromium_src-b0d6314305ddd99c0808a0a41e90b7feb89a79ea.tar.gz chromium_src-b0d6314305ddd99c0808a0a41e90b7feb89a79ea.tar.bz2 | |
Also adds debug build flag.
BUG=583690
Review URL: https://codereview.chromium.org/1597273005
Cr-Commit-Position: refs/heads/master@{#375666}
Diffstat (limited to 'base/base.gyp')
| -rw-r--r-- | base/base.gyp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/base/base.gyp b/base/base.gyp index 328e31f..38cb811 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -1415,14 +1415,14 @@ 'includes': [ '../build/android/java_cpp_template.gypi' ], }, { - # GN: //base:base_multidex_gen - 'target_name': 'base_multidex_gen', + # GN: //base:base_build_config_gen + 'target_name': 'base_build_config_gen', 'type': 'none', 'sources': [ - 'android/java/templates/ChromiumMultiDex.template', + 'android/java/templates/BuildConfig.template', ], 'variables': { - 'package_name': 'org/chromium/base/multidex', + 'package_name': 'org/chromium/base', 'template_deps': [], }, 'includes': ['../build/android/java_cpp_template.gypi'], @@ -1443,7 +1443,7 @@ 'variables': { 'java_in_dir': 'android/java', 'jar_excluded_classes': [ - '*/ChromiumMultiDex.class', + '*/BuildConfig.class', '*/NativeLibraries.class', ], }, @@ -1452,14 +1452,14 @@ 'base_java_library_load_from_apk_status_codes', 'base_java_library_process_type', 'base_java_memory_pressure_level', - 'base_multidex_gen', + 'base_build_config_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', ], 'all_dependent_settings': { 'variables': { - 'generate_multidex_config': 1, + 'generate_build_config': 1, }, }, 'includes': [ '../build/java.gypi' ], @@ -1523,7 +1523,7 @@ 'target_name': 'base_junit_test_support', 'type': 'none', 'dependencies': [ - 'base_multidex_gen', + 'base_build_config_gen', '../testing/android/junit/junit_test.gyp:junit_test_support', '../third_party/android_tools/android_tools.gyp:android_support_multidex_javalib', ], |