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

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

Issue 1533363002: GN: Remove asset_location parameter in favour of android_assets() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@asset-location-1
Patch Set: Created 5 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 | « build/config/android/internal_rules.gni ('k') | testing/test.gni » ('j') | 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 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("//build/config/sanitizers/sanitizers.gni") 8 import("//build/config/sanitizers/sanitizers.gni")
9 import("//build/toolchain/toolchain.gni") 9 import("//build/toolchain/toolchain.gni")
10 import("//third_party/android_platform/config.gni") 10 import("//third_party/android_platform/config.gni")
(...skipping 1651 matching lines...) Expand 10 before | Expand all | Expand 10 after
1662 } 1662 }
1663 if (defined(invoker.loadable_modules) && invoker.loadable_modules != []) { 1663 if (defined(invoker.loadable_modules) && invoker.loadable_modules != []) {
1664 _extra_native_libs_even_when_incremental += invoker.loadable_modules 1664 _extra_native_libs_even_when_incremental += invoker.loadable_modules
1665 } 1665 }
1666 1666
1667 _final_deps += [ ":${_template_name}__create" ] 1667 _final_deps += [ ":${_template_name}__create" ]
1668 create_apk("${_template_name}__create") { 1668 create_apk("${_template_name}__create") {
1669 deps = [] 1669 deps = []
1670 forward_variables_from(invoker, 1670 forward_variables_from(invoker,
1671 [ 1671 [
1672 "asset_location",
1673 "deps", 1672 "deps",
1674 "extensions_to_not_compress", 1673 "extensions_to_not_compress",
1675 "language_splits", 1674 "language_splits",
1676 "public_deps", 1675 "public_deps",
1677 "shared_resources", 1676 "shared_resources",
1678 "write_asset_list", 1677 "write_asset_list",
1679 ]) 1678 ])
1680 apk_path = _final_apk_path 1679 apk_path = _final_apk_path
1681 android_manifest = _android_manifest 1680 android_manifest = _android_manifest
1682 assets_build_config = _build_config 1681 assets_build_config = _build_config
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after
2236 } 2235 }
2237 2236
2238 android_library(target_name) { 2237 android_library(target_name) {
2239 java_files = [] 2238 java_files = []
2240 srcjar_deps = [ ":${_template_name}__protoc_java" ] 2239 srcjar_deps = [ ":${_template_name}__protoc_java" ]
2241 deps = [ 2240 deps = [
2242 "//third_party/android_protobuf:protobuf_nano_javalib", 2241 "//third_party/android_protobuf:protobuf_nano_javalib",
2243 ] 2242 ]
2244 } 2243 }
2245 } 2244 }
OLDNEW
« no previous file with comments | « build/config/android/internal_rules.gni ('k') | testing/test.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698