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

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

Issue 2541763003: [GN] Add support for generated proguard configs in android_apk (Closed)
Patch Set: Returned forwarding of "deps" back Created 4 years 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 | « no previous file | 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 1816 matching lines...) Expand 10 before | Expand all | Expand 10 after
1827 _proguard_configs = [ _generated_proguard_config ] 1827 _proguard_configs = [ _generated_proguard_config ]
1828 if (defined(invoker.proguard_configs)) { 1828 if (defined(invoker.proguard_configs)) {
1829 _proguard_configs += invoker.proguard_configs 1829 _proguard_configs += invoker.proguard_configs
1830 } 1830 }
1831 assert(_proguard_configs != []) # Mark as used. 1831 assert(_proguard_configs != []) # Mark as used.
1832 _proguard_target = "${_template_name}__proguard" 1832 _proguard_target = "${_template_name}__proguard"
1833 proguard(_proguard_target) { 1833 proguard(_proguard_target) {
1834 forward_variables_from(invoker, 1834 forward_variables_from(invoker,
1835 [ 1835 [
1836 "alternative_android_sdk_jar", 1836 "alternative_android_sdk_jar",
1837 "deps",
1837 "proguard_jar_path", 1838 "proguard_jar_path",
1838 ]) 1839 ])
1839 deps = [ 1840 if (!defined(deps)) {
1841 deps = []
1842 }
1843 deps += [
1840 ":$build_config_target", 1844 ":$build_config_target",
1841 ":$java_target", 1845 ":$java_target",
1842 ":$process_resources_target", 1846 ":$process_resources_target",
1843 ] 1847 ]
1844 inputs = [ 1848 inputs = [
1845 _build_config, 1849 _build_config,
1846 _jar_path, 1850 _jar_path,
1847 ] + _proguard_configs 1851 ] + _proguard_configs
1848 1852
1849 output_jar_path = _proguard_output_jar_path 1853 output_jar_path = _proguard_output_jar_path
(...skipping 911 matching lines...) Expand 10 before | Expand all | Expand 10 after
2761 # because in practice they seem to contain classes required to be in the 2765 # because in practice they seem to contain classes required to be in the
2762 # classpath. 2766 # classpath.
2763 deps += _subjar_targets 2767 deps += _subjar_targets
2764 } 2768 }
2765 if (defined(_res_target_name)) { 2769 if (defined(_res_target_name)) {
2766 deps += [ ":$_res_target_name" ] 2770 deps += [ ":$_res_target_name" ]
2767 } 2771 }
2768 } 2772 }
2769 } 2773 }
2770 } 2774 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698