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

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

Issue 2759683002: Updating android_aar_prebuilt rule to prevent unneeded args if the res folder is empty.
Patch Set: Adding name to AUTHORS file Created 3 years, 9 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
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 # Do not add any imports to non-//build directories here. 5 # Do not add any imports to non-//build directories here.
6 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in. 6 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
7 import("//build/config/android/config.gni") 7 import("//build/config/android/config.gni")
8 import("//build/config/android/internal_rules.gni") 8 import("//build/config/android/internal_rules.gni")
9 import("//build/config/compiler/compiler.gni") 9 import("//build/config/compiler/compiler.gni")
10 import("//build/config/dcheck_always_on.gni") 10 import("//build/config/dcheck_always_on.gni")
(...skipping 2795 matching lines...) Expand 10 before | Expand all | Expand 10 after
2806 # Create the android_resources target for resources. 2806 # Create the android_resources target for resources.
2807 if (_scanned_files.resources != [] || _scanned_files.has_r_text_file) { 2807 if (_scanned_files.resources != [] || _scanned_files.has_r_text_file) {
2808 _res_target_name = "${target_name}__res" 2808 _res_target_name = "${target_name}__res"
2809 android_resources(_res_target_name) { 2809 android_resources(_res_target_name) {
2810 forward_variables_from(invoker, [ "deps" ]) 2810 forward_variables_from(invoker, [ "deps" ])
2811 if (!defined(deps)) { 2811 if (!defined(deps)) {
2812 deps = [] 2812 deps = []
2813 } 2813 }
2814 deps += [ ":$_unpack_target_name" ] 2814 deps += [ ":$_unpack_target_name" ]
2815 resource_dirs = [] 2815 resource_dirs = []
2816 generated_resource_dirs = [ "${_output_path}/res" ] 2816 if (_scanned_files.resources != []) {
2817 generated_resource_files = 2817 generated_resource_dirs = [ "${_output_path}/res" ]
2818 rebase_path(_scanned_files.resources, "", _output_path) 2818 generated_resource_files =
2819 rebase_path(_scanned_files.resources, "", _output_path)
2820 }
2819 android_manifest_dep = ":$_unpack_target_name" 2821 android_manifest_dep = ":$_unpack_target_name"
2820 android_manifest = "${_output_path}/AndroidManifest.xml" 2822 android_manifest = "${_output_path}/AndroidManifest.xml"
2821 if (_scanned_files.has_r_text_file) { 2823 if (_scanned_files.has_r_text_file) {
2822 r_text_file = "${_output_path}/R.txt" 2824 r_text_file = "${_output_path}/R.txt"
2823 } 2825 }
2824 v14_skip = true 2826 v14_skip = true
2825 } 2827 }
2826 } 2828 }
2827 2829
2828 # Create android_java_prebuilt target for extra jars within jars/. 2830 # Create android_java_prebuilt target for extra jars within jars/.
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
2893 # because in practice they seem to contain classes required to be in the 2895 # because in practice they seem to contain classes required to be in the
2894 # classpath. 2896 # classpath.
2895 deps += _subjar_targets 2897 deps += _subjar_targets
2896 } 2898 }
2897 if (defined(_res_target_name)) { 2899 if (defined(_res_target_name)) {
2898 deps += [ ":$_res_target_name" ] 2900 deps += [ ":$_res_target_name" ]
2899 } 2901 }
2900 } 2902 }
2901 } 2903 }
2902 } 2904 }
OLDNEW
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698