build/config/android/config.gni - Issue 1828523002: Support packaging secondary abi native libraries in APK.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/config/android/config.gni

Issue 1828523002: Support packaging secondary abi native libraries in APK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 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

Index: build/config/android/config.gni

diff --git a/build/config/android/config.gni b/build/config/android/config.gni

index aff3b2f04f1d52fb8402c89686483d79413580c8..d6ff86a663f32d1cdb957bac91e69c4b280af467 100644

--- a/build/config/android/config.gni

+++ b/build/config/android/config.gni

@@ -232,8 +232,11 @@ if (is_android) {

# ABI ------------------------------------------------------------------------

+ # Intentionally not define android_app_secondary_abi for 64-bit

agrieve 2016/03/23 18:11:19 nit: "Intentionally not define" -> "Intentionally

michaelbai 2016/03/23 18:55:33 Done.

+ # android_app_abi, since they are not used.

if (current_cpu == "x86") {

android_app_abi = "x86"

+ android_app_secondary_abi = "x86_64"

} else if (current_cpu == "arm") {

import("//build/config/arm.gni")

if (arm_version < 7) {

@@ -241,8 +244,10 @@ if (is_android) {

} else {

android_app_abi = "armeabi-v7a"

}

+ android_app_secondary_abi = "arm64-v8a"

} else if (current_cpu == "mipsel") {

android_app_abi = "mips"

+ android_app_secondary_abi = "mips64"

} else if (current_cpu == "x64") {

android_app_abi = "x86_64"

} else if (current_cpu == "arm64") {

« build/android/gyp/apkbuilder.py ('K') | « build/android/gyp/apkbuilder.py ('k') | build/config/android/internal_rules.gni » ('j') | no next file with comments »