build/android/java_cpp_template.gypi - Issue 1581563003: [Android] Rework multidex and enable multidex for unit_tests_apk.

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/android/java_cpp_template.gypi

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: build/android/java_cpp_template.gypi

diff --git a/build/android/java_cpp_template.gypi b/build/android/java_cpp_template.gypi

index f4ea0a9195d38eaa940040c46ada3e6f1e8fbaa6..3296659240b57b7f2711ac7d204622988b7de0c7 100644

--- a/build/android/java_cpp_template.gypi

+++ b/build/android/java_cpp_template.gypi

@@ -34,7 +34,6 @@

{

# Location where all generated Java sources will be placed.

'variables': {

- 'additional_gcc_preprocess_options': [],

'include_path%': '<(DEPTH)',

'output_dir': '<(SHARED_INTERMEDIATE_DIR)/templates/<(_target_name)/<(package_name)',

@@ -75,7 +74,6 @@

'--include-path=<(include_path)',

'--output=<(output_path)',

'--template=<(RULE_INPUT_PATH)',

- '<@(additional_gcc_preprocess_options)',

'message': 'Generating Java from cpp template <(RULE_INPUT_PATH)',

}

« no previous file with comments | « build/android/gyp/configure_multidex.py ('k') | build/config/android/rules.gni » ('j') | no next file with comments »