diff options
| author | shouqun.liu@intel.com <shouqun.liu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-16 06:18:41 +0000 |
|---|---|---|
| committer | shouqun.liu@intel.com <shouqun.liu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-16 06:18:41 +0000 |
| commit | de5b7a4a1fdb5f5b84b86c86e4aa65bed0e7d8d1 (patch) | |
| tree | 1d9387afcf3b95821e5e2071d964939a5cc79ef7 /build | |
| parent | f71a87878f4f1c2f18d54d989a320fb86864580b (diff) | |
| download | chromium_src-de5b7a4a1fdb5f5b84b86c86e4aa65bed0e7d8d1.zip chromium_src-de5b7a4a1fdb5f5b84b86c86e4aa65bed0e7d8d1.tar.gz chromium_src-de5b7a4a1fdb5f5b84b86c86e4aa65bed0e7d8d1.tar.bz2 | |
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
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 9 |
1 files changed, 9 insertions, 0 deletions
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, |