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

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

Issue 1563823002: Allow placeholders when the native_libs is empty. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 | « 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 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 1720 matching lines...) Expand 10 before | Expand all | Expand 10 after
1731 ] 1731 ]
1732 1732
1733 if ((_native_libs != [] || _extra_native_libs_even_when_incremental != []) & & !_create_abi_split) { 1733 if ((_native_libs != [] || _extra_native_libs_even_when_incremental != []) & & !_create_abi_split) {
1734 deps += _native_libs_deps + _extra_native_libs_deps + 1734 deps += _native_libs_deps + _extra_native_libs_deps +
1735 _extra_native_libs_even_when_incremental_deps + 1735 _extra_native_libs_even_when_incremental_deps +
1736 [ _native_libs_file_arg_dep ] 1736 [ _native_libs_file_arg_dep ]
1737 native_libs_filearg = _native_libs_file_arg 1737 native_libs_filearg = _native_libs_file_arg
1738 native_libs = _extra_native_libs 1738 native_libs = _extra_native_libs
1739 native_libs_even_when_incremental = 1739 native_libs_even_when_incremental =
1740 _extra_native_libs_even_when_incremental 1740 _extra_native_libs_even_when_incremental
1741 }
1741 1742
1742 # Placeholders necessary for some older devices. 1743 # Placeholders necessary for some older devices.
1743 # http://crbug.com/395038 1744 # http://crbug.com/395038
1744 forward_variables_from(invoker, [ "native_lib_placeholders" ]) 1745 forward_variables_from(invoker, [ "native_lib_placeholders" ])
1745 }
1746 } 1746 }
1747 1747
1748 if ((_native_libs != [] || _extra_native_libs_even_when_incremental != []) && 1748 if ((_native_libs != [] || _extra_native_libs_even_when_incremental != []) &&
1749 _create_abi_split) { 1749 _create_abi_split) {
1750 _manifest_rule = "${_template_name}__split_manifest_abi_${android_app_abi}" 1750 _manifest_rule = "${_template_name}__split_manifest_abi_${android_app_abi}"
1751 generate_split_manifest(_manifest_rule) { 1751 generate_split_manifest(_manifest_rule) {
1752 main_manifest = _android_manifest 1752 main_manifest = _android_manifest
1753 out_manifest = 1753 out_manifest =
1754 "$gen_dir/split-manifests/${android_app_abi}/AndroidManifest.xml" 1754 "$gen_dir/split-manifests/${android_app_abi}/AndroidManifest.xml"
1755 split_name = "abi_${android_app_abi}" 1755 split_name = "abi_${android_app_abi}"
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
2254 } 2254 }
2255 2255
2256 android_library(target_name) { 2256 android_library(target_name) {
2257 java_files = [] 2257 java_files = []
2258 srcjar_deps = [ ":${_template_name}__protoc_java" ] 2258 srcjar_deps = [ ":${_template_name}__protoc_java" ]
2259 deps = [ 2259 deps = [
2260 "//third_party/android_protobuf:protobuf_nano_javalib", 2260 "//third_party/android_protobuf:protobuf_nano_javalib",
2261 ] 2261 ]
2262 } 2262 }
2263 } 2263 }
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