Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(101)

Unified Diff: platform_tools/android/gyp/skia_android.gypi

Issue 1415453009: Wire up SDL on Android (Closed) Base URL: https://skia.googlesource.com/skia.git@sdl
Patch Set: fix appurify Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: platform_tools/android/gyp/skia_android.gypi
diff --git a/platform_tools/android/gyp/skia_android.gypi b/platform_tools/android/gyp/skia_android.gypi
index 09a63d50aad0ec58128ab3158580a854f320d58d..8833afef211c810ef320cb0b2ad26657ce384eaf 100644
--- a/platform_tools/android/gyp/skia_android.gypi
+++ b/platform_tools/android/gyp/skia_android.gypi
@@ -210,5 +210,71 @@
},
],
},
+ # TODO all of this duplicated code can be removed when SDL becomes the default
+ # Currently, to use this you have to override skia_use_sdl
+ {
+ 'target_name': 'CopyVisualBenchSDLDeps',
+ 'type': 'none',
+ 'dependencies': [
+ 'skia_lib.gyp:skia_lib',
+ 'visualbench.gyp:visualbench',
+ ],
+
+ 'copies': [
+ # Copy all shared libraries into the Android app's libs folder. Note
+ # that this copy requires us to build SkiaAndroidApp after those
+ # libraries, so that they exist by the time it occurs. If there are no
+ # libraries to copy, this will cause an error in Make, but the app will
+ # still build.
+ {
+ 'destination': '<(android_base)/apps/visualbenchsdl/src/main/libs/<(android_arch)',
+ 'conditions': [
+ [ 'skia_shared_lib', {
+ 'files': [
+ '<(SHARED_LIB_DIR)/libskia_android.so',
+ '<(SHARED_LIB_DIR)/libvisualbench.so',
+ ]}, {
+ 'files': [
+ '<(SHARED_LIB_DIR)/libvisualbench.so',
+ ]}
+ ],
+ ],
+ },
+ ],
+ },
+ {
+ 'target_name': 'VisualBenchSDL_APK',
+ 'type': 'none',
+ 'dependencies': [
+ 'CopyVisualBenchSDLDeps',
+ ],
+ 'actions': [
+ {
+ 'action_name': 'SkiaVisualBenchSDL_apk',
+ 'inputs': [
+ '<(android_base)/apps/visualbenchsdl/src/main/AndroidManifest.xml',
+ '<(android_base)/apps/visualbenchsdl/src/main/java/org/libsdl/app/SDLActivity.java',
+ '<(android_base)/apps/visualbenchsdl/src/main/java/com/skia/VisualBenchActivity.java',
+ '<(android_base)/apps/visualbenchsdl/src/main/libs/<(android_arch)/libvisualbench.so',
+ ],
+ 'conditions': [
+ [ 'skia_shared_lib', {
+ 'inputs': [
+ '<(android_base)/apps/visualbenchsdl/src/main/libs/<(android_arch)/libskia_android.so',
+ ],
+ }],
+ ],
+ 'outputs': [
+ '<(android_base)/apps/visualbenchsdl/build/outputs/apk/visualbench-<(android_variant)-<(android_apk_suffix)',
+ ],
+ 'action': [
+ '<(android_base)/apps/gradlew',
+ ':visualbenchsdl:assemble<(android_variant)<(android_buildtype)',
+ '-p<(android_base)/apps/visualbenchsdl',
+ '-PsuppressNativeBuild',
+ ],
+ },
+ ],
+ },
],
}

Powered by Google App Engine
This is Rietveld 408576698