Fix the content_shell.apk in android x86 target build bug, copy the libcontent_shell_content_view.so and gdbserver to the correct position.
BUG=127532
TEST=
Review URL: https://chromiumcodereview.appspot.com/10388067
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137370 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/build/common.gypi b/build/common.gypi
index e0a5f6b..3c63c5c 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -836,6 +836,13 @@
'conditions': [
['target_arch == "ia32"', {
'target_arch': 'x86',
+ 'android_app_abi%': 'x86',
+ }],
+ ['target_arch=="arm" and armv7==0', {
+ 'android_app_abi%': 'armeabi',
+ }],
+ ['target_arch=="arm" and armv7==1', {
+ 'android_app_abi%': 'armeabi-v7a',
}],
],
@@ -846,11 +853,13 @@
'android_ndk_root%': '<(android_ndk_root)',
'android_ndk_sysroot': '<(android_ndk_root)/platforms/android-9/arch-<(target_arch)',
'android_build_type%': '<(android_build_type)',
+ 'android_app_abi%': '<(android_app_abi)',
},
'android_ndk_root%': '<(android_ndk_root)',
'android_ndk_sysroot': '<(android_ndk_sysroot)',
'android_ndk_include': '<(android_ndk_sysroot)/usr/include',
'android_ndk_lib': '<(android_ndk_sysroot)/usr/lib',
+ 'android_app_abi%': '<(android_app_abi)',
# Uses Android's crash report system
'linux_breakpad%': 0,
