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

build/android/tests/bad_resources/bad_resources.gyp

Index: build/android/tests/bad_resources/bad_resources.gyp
diff --git a/build/android/tests/bad_resources/bad_resources.gyp b/build/android/tests/bad_resources/bad_resources.gyp
new file mode 100644
index 0000000000000000000000000000000000000000..0f6ca74f9a2c8e09c24f44282d2f76c7d7482dd7
--- /dev/null
+++ b/build/android/tests/bad_resources/bad_resources.gyp
@@ -0,0 +1,51 @@
+# Copyright 2015 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'variables': {
+    'chromium_code': 1,
+  },
+  'targets': [
+    {
+      'target_name': 'empty_resources_dep',
+      'type': 'none',
+      'variables': {
+        'java_in_dir': 'empty_dep/java',
+        'has_java_resources': 1,
+        'R_package': 'dummy.emptydep',
+        'R_package_relpath': 'dummy/emptydep',
+      },
+      'includes': [ '../../../../build/java.gypi' ],
+    },
+    {
+      'target_name': 'bad_resources_dep',
+      'type': 'none',
+      'variables': {
+        'java_in_dir': 'dep/java',
+        'has_java_resources': 1,
+        'R_package': 'dummy.dep',
+        'R_package_relpath': 'dummy/dep',
+      },
+      'includes': [ '../../../../build/java.gypi' ],
+    },
+    {
+      'target_name': 'bad_resources_test_apk',
+      'type': 'none',
+      'dependencies': ['bad_resources_dep'],
+      'variables': {
+        'app_manifest_version_name%': '<(android_app_version_name)',
+        'java_in_dir': 'app/java',
+        'resource_dir': 'app/res',
+        'R_package': 'dummy',
+        'R_package_relpath': 'dummy',
+        'apk_name': 'BadResources',
+        # This is a build-only test. There's nothing to install.
+        'gyp_managed_install': 0,
+        # Include this APK's resources in the R.java files of its dependencies
+        'include_all_resources': 1,
+      },
+      'includes': [ '../../../../build/java_apk.gypi' ],
+    },
+  ],
+}