build/config/android/rules.gni - Issue 1129103002: Revert of Actually use --extra-r-text-files in process_resources.py

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/config/android/rules.gni

Issue 1129103002: Revert of Actually use --extra-r-text-files in process_resources.py (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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:

View side-by-side diff with in-line comments

Download patch

Index: build/config/android/rules.gni

diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni

index efe0a003ea799e8033814352b888e99ba4b6d7a1..b1b23b0220ff355a6183c05589c795d1805cc1e9 100644

--- a/build/config/android/rules.gni

+++ b/build/config/android/rules.gni

@@ -548,14 +548,12 @@

base_path = "$target_gen_dir/$target_name"

zip_path = base_path + ".resources.zip"

srcjar_path = base_path + ".srcjar"

- r_text_path = base_path + "_R.txt"

build_config = base_path + ".build_config"

write_build_config("${target_name}__build_config") {

type = "android_resources"

resources_zip = zip_path

srcjar = srcjar_path

- r_text = r_text_path

if (defined(invoker.deps)) {

deps = invoker.deps

}

@@ -1308,7 +1306,6 @@

final_deps += [ ":${_template_name}__process_resources" ]

process_resources("${_template_name}__process_resources") {

srcjar_path = "${target_gen_dir}/${target_name}.srcjar"

- r_text_path = "${target_gen_dir}/${target_name}_R.txt"

android_manifest = _android_manifest

resource_dirs = [ "//build/android/ant/empty/res" ]

zip_path = resources_zip_path

« no previous file with comments | « build/config/android/internal_rules.gni ('k') | build/java_apk.gypi » ('j') | no next file with comments »