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

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

Issue 1395013002: GN: Fix incremental install failing on some 64 bit devices (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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("//build/toolchain/toolchain.gni") 8 import("//build/toolchain/toolchain.gni")
9 import("//third_party/android_platform/config.gni") 9 import("//third_party/android_platform/config.gni")
10 import("//tools/grit/grit_rule.gni") 10 import("//tools/grit/grit_rule.gni")
(...skipping 1203 matching lines...) Expand 10 before | Expand all | Expand 10 after
1214 _srcjar_deps = [] 1214 _srcjar_deps = []
1215 if (defined(invoker.srcjar_deps)) { 1215 if (defined(invoker.srcjar_deps)) {
1216 _srcjar_deps += invoker.srcjar_deps 1216 _srcjar_deps += invoker.srcjar_deps
1217 } 1217 }
1218 1218
1219 _load_library_from_apk = false 1219 _load_library_from_apk = false
1220 1220
1221 # The dependency that makes the chromium linker, if any is needed. 1221 # The dependency that makes the chromium linker, if any is needed.
1222 _chromium_linker_dep = [] 1222 _chromium_linker_dep = []
1223 1223
1224 if (defined(invoker.native_libs)) { 1224 if (defined(invoker.native_libs) && invoker.native_libs != []) {
1225 _use_chromium_linker = false 1225 _use_chromium_linker = false
1226 if (defined(invoker.use_chromium_linker)) { 1226 if (defined(invoker.use_chromium_linker)) {
1227 _use_chromium_linker = 1227 _use_chromium_linker =
1228 invoker.use_chromium_linker && chromium_linker_supported 1228 invoker.use_chromium_linker && chromium_linker_supported
1229 _chromium_linker_dep = [ "//base/android/linker:chromium_android_linker" ] 1229 _chromium_linker_dep = [ "//base/android/linker:chromium_android_linker" ]
1230 } 1230 }
1231 1231
1232 if (defined(invoker.load_library_from_apk) && 1232 if (defined(invoker.load_library_from_apk) &&
1233 invoker.load_library_from_apk) { 1233 invoker.load_library_from_apk) {
1234 _load_library_from_apk = true 1234 _load_library_from_apk = true
(...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after
2046 2046
2047 # TODO(GYP): implement this. 2047 # TODO(GYP): implement this.
2048 template("uiautomator_test") { 2048 template("uiautomator_test") {
2049 set_sources_assignment_filter([]) 2049 set_sources_assignment_filter([])
2050 forward_variables_from(invoker, [ "testonly" ]) 2050 forward_variables_from(invoker, [ "testonly" ])
2051 assert(target_name != "") 2051 assert(target_name != "")
2052 assert(invoker.deps != [] || true) 2052 assert(invoker.deps != [] || true)
2053 group(target_name) { 2053 group(target_name) {
2054 } 2054 }
2055 } 2055 }
OLDNEW
« build/android/gyp/apkbuilder.py ('K') | « build/config/android/internal_rules.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698