aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools
diff options
context:
space:
mode:
authorGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-12-02 13:36:22 +0000
committerGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-12-02 13:36:22 +0000
commit5b39f5ba9c339d1e4dae391fee9ec1396feec180 (patch)
tree1c9ae56ec4e8faec6f4422d7a506423425ccde6b /platform_tools
parent742058f0ca473dd871a1235a0f30b1736b045ec9 (diff)
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@12427 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'platform_tools')
-rw-r--r--platform_tools/android/app/src/com/skia/SkiaSampleActivity.java5
-rwxr-xr-xplatform_tools/android/bin/android_run_skia5
-rwxr-xr-xplatform_tools/android/bin/android_setup.sh4
-rw-r--r--platform_tools/android/gyp/skia_android.gypi13
-rw-r--r--platform_tools/android/launcher/skia_launcher.cpp10
5 files changed, 6 insertions, 31 deletions
diff --git a/platform_tools/android/app/src/com/skia/SkiaSampleActivity.java b/platform_tools/android/app/src/com/skia/SkiaSampleActivity.java
index 0a7a569728..62f81a58f5 100644
--- a/platform_tools/android/app/src/com/skia/SkiaSampleActivity.java
+++ b/platform_tools/android/app/src/com/skia/SkiaSampleActivity.java
@@ -43,11 +43,6 @@ public class SkiaSampleActivity extends Activity
try {
System.loadLibrary("skia_android");
- } catch (UnsatisfiedLinkError e) {
- // This might be because skia was linked to SampleApp statically.
- }
-
- try {
System.loadLibrary("SampleApp");
LinearLayout holder = (LinearLayout) findViewById(R.id.holder);
diff --git a/platform_tools/android/bin/android_run_skia b/platform_tools/android/bin/android_run_skia
index 11c36756f5..3314225ba4 100755
--- a/platform_tools/android/bin/android_run_skia
+++ b/platform_tools/android/bin/android_run_skia
@@ -28,10 +28,7 @@ then
fi
adb_push_if_needed "${SKIA_OUT}/${configuration}/skia_launcher" /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/libskia_android.so" /data/local/tmp
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 b11fcaccb4..1a5ccf9908 100755
--- a/platform_tools/android/bin/android_setup.sh
+++ b/platform_tools/android/bin/android_setup.sh
@@ -161,9 +161,7 @@ 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}/.."
- if [[ "$GYP_DEFINES" != *skia_shared_lib=* ]]; then
- DEFINES="${DEFINES} skia_shared_lib=1"
- fi
+ DEFINES="${DEFINES} skia_shared_lib=1"
# Setup the build variation depending on the target device
TARGET_DEVICE="$1"
diff --git a/platform_tools/android/gyp/skia_android.gypi b/platform_tools/android/gyp/skia_android.gypi
index 270b934baf..d4f865a1ae 100644
--- a/platform_tools/android/gyp/skia_android.gypi
+++ b/platform_tools/android/gyp/skia_android.gypi
@@ -30,16 +30,9 @@
# still build.
{
'destination': '<(PRODUCT_DIR)/android/libs/<(android_arch)',
- 'conditions': [
- [ 'skia_shared_lib', {
- 'files': [
- '<(SHARED_LIB_DIR)/libSampleApp.so',
- '<(SHARED_LIB_DIR)/libskia_android.so',
- ]}, {
- 'files': [
- '<(SHARED_LIB_DIR)/libSampleApp.so',
- ]}
- ],
+ 'files': [
+ '<(SHARED_LIB_DIR)/libSampleApp.so',
+ '<(SHARED_LIB_DIR)/libskia_android.so',
],
},
],
diff --git a/platform_tools/android/launcher/skia_launcher.cpp b/platform_tools/android/launcher/skia_launcher.cpp
index 746d470a3c..718a7173da 100644
--- a/platform_tools/android/launcher/skia_launcher.cpp
+++ b/platform_tools/android/launcher/skia_launcher.cpp
@@ -67,16 +67,12 @@ int main(int argc, const char** argv) {
return -1;
}
- void* skiaLibrary;
-
-#if defined(SKIA_DLL)
// load the local skia shared library
- skiaLibrary = load_library(appLocation, "skia_android");
+ void* skiaLibrary = load_library(appLocation, "skia_android");
if (NULL == skiaLibrary)
{
return -1;
}
-#endif
// load the appropriate library
void* appLibrary = load_library(appLocation, argv[1]);
@@ -84,10 +80,6 @@ int main(int argc, const char** argv) {
return -1;
}
-#if !defined(SKIA_DLL)
- skiaLibrary = appLibrary;
-#endif
-
// find the address of the main function
int (*app_main)(int, const char**);
*(void **) (&app_main) = dlsym(appLibrary, "main");