build/java_apk.gypi - Issue 935333002: Update from https://crrev.com/316786

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 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 5 years, 10 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 424355433d5bb42c7535bd07d4a7fc3749f82df9..8d55307924488948af7a705b448743699ee7b857 100644

--- a/build/java_apk.gypi

+++ b/build/java_apk.gypi

@@ -24,9 +24,8 @@

# Optional/automatic variables:

# additional_input_paths - These paths will be included in the 'inputs' list to

# ensure that this target is rebuilt when one of these paths changes.

-# additional_res_dirs - Additional directories containing Android resources.

-# additional_res_packages - Package names of the R.java files corresponding to

-# each directory in additional_res_dirs.

+# additional_res_packages - Package names of R.java files generated in addition

+# to the default package name defined in AndroidManifest.xml.

# additional_src_dirs - Additional directories with .java files to be compiled

# and included in the output of this target.

# additional_bundled_libs - Additional libraries what will be stripped and

« no previous file with comments | « build/ios/grit_whitelist.txt ('k') | build/sanitizers/OWNERS » ('j') | no next file with comments »