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

Unified 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 side-by-side diff with in-line comments
Download patch
« build/android/gyp/apkbuilder.py ('K') | « build/config/android/internal_rules.gni ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 6c528444f12c3de42b480b76bdcb4a1b00fa94a2..1d0a1f723c910a541c45aba9c9c5ec254c761ea9 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1221,7 +1221,7 @@ template("android_apk") {
# The dependency that makes the chromium linker, if any is needed.
_chromium_linker_dep = []
- if (defined(invoker.native_libs)) {
+ if (defined(invoker.native_libs) && invoker.native_libs != []) {
_use_chromium_linker = false
if (defined(invoker.use_chromium_linker)) {
_use_chromium_linker =
« 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