Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(633)

Side by Side Diff: build/config/android/rules.gni

Issue 1104703003: Actually use --extra-r-text-files in process_resources.py (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use correct R class in SyncCustomizationFragmentTest 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 unified diff | Download patch
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//base/android/linker/config.gni") 5 import("//base/android/linker/config.gni")
6 import("//build/config/android/config.gni") 6 import("//build/config/android/config.gni")
7 import("//build/config/android/internal_rules.gni") 7 import("//build/config/android/internal_rules.gni")
8 import("//tools/grit/grit_rule.gni") 8 import("//tools/grit/grit_rule.gni")
9 import("//tools/relocation_packer/config.gni") 9 import("//tools/relocation_packer/config.gni")
10 10
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 if (defined(invoker.testonly)) { 541 if (defined(invoker.testonly)) {
542 testonly = invoker.testonly 542 testonly = invoker.testonly
543 } 543 }
544 544
545 assert(defined(invoker.resource_dirs)) 545 assert(defined(invoker.resource_dirs))
546 assert(defined(invoker.android_manifest) || defined(invoker.custom_package)) 546 assert(defined(invoker.android_manifest) || defined(invoker.custom_package))
547 547
548 base_path = "$target_gen_dir/$target_name" 548 base_path = "$target_gen_dir/$target_name"
549 zip_path = base_path + ".resources.zip" 549 zip_path = base_path + ".resources.zip"
550 srcjar_path = base_path + ".srcjar" 550 srcjar_path = base_path + ".srcjar"
551 r_text_path = base_path + "_R.txt"
551 build_config = base_path + ".build_config" 552 build_config = base_path + ".build_config"
552 553
553 write_build_config("${target_name}__build_config") { 554 write_build_config("${target_name}__build_config") {
554 type = "android_resources" 555 type = "android_resources"
555 resources_zip = zip_path 556 resources_zip = zip_path
556 srcjar = srcjar_path 557 srcjar = srcjar_path
558 r_text = r_text_path
557 if (defined(invoker.deps)) { 559 if (defined(invoker.deps)) {
558 deps = invoker.deps 560 deps = invoker.deps
559 } 561 }
560 if (defined(invoker.android_manifest)) { 562 if (defined(invoker.android_manifest)) {
561 android_manifest = invoker.android_manifest 563 android_manifest = invoker.android_manifest
562 } 564 }
563 if (defined(invoker.custom_package)) { 565 if (defined(invoker.custom_package)) {
564 custom_package = invoker.custom_package 566 custom_package = invoker.custom_package
565 } 567 }
566 } 568 }
(...skipping 732 matching lines...) Expand 10 before | Expand all | Expand 10 after
1299 } 1301 }
1300 1302
1301 native_libs = _native_libs 1303 native_libs = _native_libs
1302 } 1304 }
1303 1305
1304 final_deps = [] 1306 final_deps = []
1305 1307
1306 final_deps += [ ":${_template_name}__process_resources" ] 1308 final_deps += [ ":${_template_name}__process_resources" ]
1307 process_resources("${_template_name}__process_resources") { 1309 process_resources("${_template_name}__process_resources") {
1308 srcjar_path = "${target_gen_dir}/${target_name}.srcjar" 1310 srcjar_path = "${target_gen_dir}/${target_name}.srcjar"
1311 r_text_path = "${target_gen_dir}/${target_name}_R.txt"
1309 android_manifest = _android_manifest 1312 android_manifest = _android_manifest
1310 resource_dirs = [ "//build/android/ant/empty/res" ] 1313 resource_dirs = [ "//build/android/ant/empty/res" ]
1311 zip_path = resources_zip_path 1314 zip_path = resources_zip_path
1312 generate_constant_ids = true 1315 generate_constant_ids = true
1313 build_config = _build_config 1316 build_config = _build_config
1314 } 1317 }
1315 _srcjar_deps += [ ":${_template_name}__process_resources" ] 1318 _srcjar_deps += [ ":${_template_name}__process_resources" ]
1316 1319
1317 if (_native_libs != []) { 1320 if (_native_libs != []) {
1318 _enable_chromium_linker_tests = false 1321 _enable_chromium_linker_tests = false
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
1803 template("uiautomator_test") { 1806 template("uiautomator_test") {
1804 set_sources_assignment_filter([]) 1807 set_sources_assignment_filter([])
1805 if (defined(invoker.testonly)) { 1808 if (defined(invoker.testonly)) {
1806 testonly = invoker.testonly 1809 testonly = invoker.testonly
1807 } 1810 }
1808 assert(target_name != "") 1811 assert(target_name != "")
1809 assert(invoker.deps != [] || true) 1812 assert(invoker.deps != [] || true)
1810 group(target_name) { 1813 group(target_name) {
1811 } 1814 }
1812 } 1815 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698