build/java_apk.gypi - Issue 1597273005: Move ChromiumMultiDex to BuildConfig.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/java_apk.gypi

Issue 1597273005: Move ChromiumMultiDex to BuildConfig. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Prevent jni exception in release. 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:

Index: build/java_apk.gypi

diff --git a/build/java_apk.gypi b/build/java_apk.gypi

index f8e523177fc5907d01f481a2210d25dc22d22d69..277eea26948fafbe9fabb6535a1d02a44358b855 100644

--- a/build/java_apk.gypi

+++ b/build/java_apk.gypi

@@ -123,9 +123,9 @@

'native_libraries_template_data_file': '<(native_libraries_template_data_dir)/native_libraries_array.h',

'native_libraries_template_version_file': '<(native_libraries_template_data_dir)/native_libraries_version.h',

'generate_multidex_config%': 0,

- 'multidex_config_template': '<(DEPTH)/base/android/java/templates/ChromiumMultiDex.template',

+ 'multidex_config_template': '<(DEPTH)/base/android/java/templates/ChromiumBuildConfig.template',

jbudorick 2016/01/21 01:51:15 As should these five -- "multidex_config" should b

Peter Wen 2016/01/21 15:18:24 Done, replaced with chromium_build_config for easi

'multidex_config_java_dir': '<(intermediate_dir)/multidex_config/',

- 'multidex_config_java_file': '<(multidex_config_java_dir)/ChromiumMultiDex.java',

+ 'multidex_config_java_file': '<(multidex_config_java_dir)/ChromiumBuildConfig.java',

'multidex_config_java_stamp': '<(intermediate_dir)/multidex_config_java.stamp',

'compile_stamp': '<(intermediate_dir)/compile.stamp',

'lint_stamp': '<(intermediate_dir)/lint.stamp',