diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-26 20:39:11 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-26 20:39:11 +0000 |
| commit | 3daa1aed7a817f296fffb1e24f86bcb6bf56ce2f (patch) | |
| tree | 77ecee952a8a39f5b0a1cf8eaaa0d99ed678dd74 /platform_tools/android/bin | |
| parent | ee21a3e395298021ca70e0d72bf2d983b2fc9225 (diff) | |
Support linking skia statically on Android
Support linking skia statically on Android. Skia symbols should be
exported by the app library, to the extent that skia_launcher needs
them.
Syncs libskia_android.so to the device only if it exists.
R=djsollen@google.com
Author: kkinnunen@nvidia.com
Review URL: https://codereview.chromium.org/61893008
git-svn-id: http://skia.googlecode.com/svn/trunk@12399 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'platform_tools/android/bin')
| -rwxr-xr-x | platform_tools/android/bin/android_run_skia | 5 | ||||
| -rwxr-xr-x | platform_tools/android/bin/android_setup.sh | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/platform_tools/android/bin/android_run_skia b/platform_tools/android/bin/android_run_skia index 3314225ba4..11c36756f5 100755 --- a/platform_tools/android/bin/android_run_skia +++ b/platform_tools/android/bin/android_run_skia @@ -28,7 +28,10 @@ then fi adb_push_if_needed "${SKIA_OUT}/${configuration}/skia_launcher" /data/local/tmp -adb_push_if_needed "${SKIA_OUT}/${configuration}/lib.target/libskia_android.so" /data/local/tmp +if [ -f "${SKIA_OUT}/${configuration}/lib.target/libskia_android.so" ]; then + # Does not exist for builds with static skia. + adb_push_if_needed "${SKIA_OUT}/${configuration}/lib.target/libskia_android.so" /data/local/tmp +fi adb_push_if_needed "${SKIA_OUT}/${configuration}/lib.target/lib${runVars[0]}.so" /data/local/tmp STATUS_FILENAME="/data/local/tmp/.skia_tmp_$(date +%s%N)" diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh index 1a5ccf9908..b11fcaccb4 100755 --- a/platform_tools/android/bin/android_setup.sh +++ b/platform_tools/android/bin/android_setup.sh @@ -161,7 +161,9 @@ setup_device() { DEFINES="${DEFINES} host_os=$(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')" DEFINES="${DEFINES} skia_os=android" DEFINES="${DEFINES} android_base=${SCRIPT_DIR}/.." - DEFINES="${DEFINES} skia_shared_lib=1" + if [[ "$GYP_DEFINES" != *skia_shared_lib=* ]]; then + DEFINES="${DEFINES} skia_shared_lib=1" + fi # Setup the build variation depending on the target device TARGET_DEVICE="$1" |