Reland: Actually use --extra-r-text-files in process_resources.py

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index b1b23b0220ff355a6183c05589c795d1805cc1e9..168ebb4dea495060bccde50901842073db660bb6 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -530,6 +530,7 @@ template("jinja_template_resources") {
 #   shared_resources: If true make a resource package that can be loaded by a
 #     different application at runtime to access the package's resources.
 #
+
 # Example
 #   android_resources("foo_resources") {
 #     deps = [":foo_strings_grd"]
@@ -548,12 +549,14 @@ template("android_resources") {
   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
     }
@@ -1163,6 +1166,8 @@ template("android_java_prebuilt") {
 #     also be included in the apk.
 #   apk_under_test: For an instrumentation test apk, this is the target of the
 #     tested apk.
+#   include_all_resources - If true include all resource IDs in all generated
+#     R.java files.
 #   testonly: Marks this target as "test-only".
 #
 #   DEPRECATED_java_in_dir: Directory containing java files. All .java files in
@@ -1306,11 +1311,16 @@ template("android_apk") {
   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
     generate_constant_ids = true
     build_config = _build_config
+
+    if (defined(invoker.include_all_resources)) {
+      include_all_resources = invoker.include_all_resources
+    }
   }
   _srcjar_deps += [ ":${_template_name}__process_resources" ]