build/android/gyp/write_build_config.py - Issue 1952153002: 👪 Strip R.class in android_prebuilt()

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/gyp/write_build_config.py

Issue 1952153002: 👪 Strip R.class in android_prebuilt() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Don't strip out *all* R.class, just those associated with known resources Created 4 years, 7 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/android/gyp/write_build_config.py

diff --git a/build/android/gyp/write_build_config.py b/build/android/gyp/write_build_config.py

index 7213240fe79a14702978245d06e4172321b1c430..e0b727b14badf14f147ce5d43146b9ec19854b2c 100755

--- a/build/android/gyp/write_build_config.py

+++ b/build/android/gyp/write_build_config.py

@@ -376,6 +376,11 @@ def main(argv):

config['javac']['srcjars'] = [

c['srcjar'] for c in direct_resources_deps if 'srcjar' in c]

+ # Used to strip out R.class for android_prebuilt()s.

+ if options.type == 'java_library':

+ config['javac']['resource_packages'] = [

+ c['package_name'] for c in all_resources_deps if 'package_name' in c]

if options.type == 'android_apk':

# Apks will get their resources srcjar explicitly passed to the java step.

config['javac']['srcjars'] = []