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 /content | |
| 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 'content')
| -rw-r--r-- | content/content_shell.gypi | 5 | ||||
| -rw-r--r-- | content/shell/android/content_shell_apk.xml | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 4a67c23..965cc9d 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -548,7 +548,7 @@ { 'action_name': 'copy_and_strip_so', 'inputs': ['<(SHARED_LIB_DIR)/libcontent_shell_content_view.so'], - 'outputs': ['<(PRODUCT_DIR)/content_shell/libs/armeabi/libcontent_shell_content_view.so'], + 'outputs': ['<(PRODUCT_DIR)/content_shell/libs/<(android_app_abi)/libcontent_shell_content_view.so'], 'action': [ '<!(/bin/echo -n $STRIP)', '--strip-unneeded', # All symbols not needed for relocation. @@ -568,7 +568,7 @@ '<(PRODUCT_DIR)/content_shell/java/libs/chromium_net.jar', '<(PRODUCT_DIR)/content_shell/java/libs/chromium_media.jar', '<(PRODUCT_DIR)/content_shell/java/libs/chromium_content.jar', - '<(PRODUCT_DIR)/content_shell/libs/armeabi/libcontent_shell_content_view.so', + '<(PRODUCT_DIR)/content_shell/libs/<(android_app_abi)/libcontent_shell_content_view.so', ], 'outputs': [ # Awkwardly, we build a Debug APK even when gyp is in @@ -580,6 +580,7 @@ 'action': [ 'ant', '-DPRODUCT_DIR=<(PRODUCT_DIR)', + '-DAPP_ABI=<(android_app_abi)', '-buildfile', '<(DEPTH)/content/shell/android/content_shell_apk.xml', ] diff --git a/content/shell/android/content_shell_apk.xml b/content/shell/android/content_shell_apk.xml index 003380b..ebdf6e6 100644 --- a/content/shell/android/content_shell_apk.xml +++ b/content/shell/android/content_shell_apk.xml @@ -15,6 +15,7 @@ <property name="toolchain.dir" location="${env.ANDROID_TOOLCHAIN}"/> <property name="source.dir" location="java"/> <property name="target" value="android-14"/> + <property name="target.abi" value="${APP_ABI}"/> <property name="out.dir" location="${PRODUCT_DIR}/content_shell"/> <property name="resource.absolute.dir" value="res"/> <property name="gen.absolute.dir" value="${out.dir}/gen"/> @@ -58,7 +59,7 @@ </condition> <then> <echo message="Copying gdbserver to the apk to enable native debugging"/> - <copy todir="${out.dir}/libs/armeabi"> + <copy todir="${out.dir}/libs/${target.abi}"> <path refid="native.libs.gdbserver"/> </copy> </then> |