From 345242671587d7273819bfe423be96e4392033e3 Mon Sep 17 00:00:00 2001 From: jvanverth Date: Wed, 4 May 2016 13:49:13 -0700 Subject: Rename VulkanViewer to Viewer, take 2. Also puts Window and Application in sk_app namespace. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1945103003 Review-Url: https://codereview.chromium.org/1945103003 --- platform_tools/android/apps/settings.gradle | 2 +- platform_tools/android/apps/viewer/build.gradle | 24 ++++++++ .../apps/viewer/src/main/AndroidManifest.xml | 26 +++++++++ .../main/java/org/skia/viewer/ViewerActivity.java | 28 ++++++++++ .../android/apps/vulkanviewer/build.gradle | 24 -------- .../apps/vulkanviewer/src/main/AndroidManifest.xml | 26 --------- .../skia/vulkanviewer/VulkanViewerActivity.java | 28 ---------- platform_tools/android/gyp/skia_android.gypi | 2 +- platform_tools/android/gyp/viewer.gypi | 65 ++++++++++++++++++++++ platform_tools/android/gyp/vulkanviewer.gypi | 65 ---------------------- 10 files changed, 145 insertions(+), 145 deletions(-) create mode 100644 platform_tools/android/apps/viewer/build.gradle create mode 100644 platform_tools/android/apps/viewer/src/main/AndroidManifest.xml create mode 100644 platform_tools/android/apps/viewer/src/main/java/org/skia/viewer/ViewerActivity.java delete mode 100644 platform_tools/android/apps/vulkanviewer/build.gradle delete mode 100644 platform_tools/android/apps/vulkanviewer/src/main/AndroidManifest.xml delete mode 100644 platform_tools/android/apps/vulkanviewer/src/main/java/org/skia/vulkanviewer/VulkanViewerActivity.java create mode 100644 platform_tools/android/gyp/viewer.gypi delete mode 100644 platform_tools/android/gyp/vulkanviewer.gypi (limited to 'platform_tools') diff --git a/platform_tools/android/apps/settings.gradle b/platform_tools/android/apps/settings.gradle index 9d103b49be..d462ca8bbb 100644 --- a/platform_tools/android/apps/settings.gradle +++ b/platform_tools/android/apps/settings.gradle @@ -2,4 +2,4 @@ include ':sample_app' include ':visualbench' include ':visualbenchsdl' include ':canvasproof' -include ':vulkanviewer' +include ':viewer' diff --git a/platform_tools/android/apps/viewer/build.gradle b/platform_tools/android/apps/viewer/build.gradle new file mode 100644 index 0000000000..79cac8a7d4 --- /dev/null +++ b/platform_tools/android/apps/viewer/build.gradle @@ -0,0 +1,24 @@ +/* + * Copyright 2015 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ +apply plugin: 'com.android.application' +android { + compileSdkVersion 19 + buildToolsVersion "22.0.1" + defaultConfig { + applicationId "org.skia.viewer" + minSdkVersion 19 + targetSdkVersion 19 + versionCode 1 + versionName "1.0" + signingConfig signingConfigs.debug + } + sourceSets.main.jni.srcDirs = [] //disable automatic ndk-build call + sourceSets.main.jniLibs.srcDir "src/main/libs" + productFlavors { arm {}; arm64 {}; x86 {}; x86_64 {}; mips {}; mips64 {}; } + + setupSkiaLibraryBuild(project, applicationVariants, "--vulkan CopyViewerDeps", true) +} diff --git a/platform_tools/android/apps/viewer/src/main/AndroidManifest.xml b/platform_tools/android/apps/viewer/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..2ed88e1da6 --- /dev/null +++ b/platform_tools/android/apps/viewer/src/main/AndroidManifest.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + diff --git a/platform_tools/android/apps/viewer/src/main/java/org/skia/viewer/ViewerActivity.java b/platform_tools/android/apps/viewer/src/main/java/org/skia/viewer/ViewerActivity.java new file mode 100644 index 0000000000..950d6b2d5b --- /dev/null +++ b/platform_tools/android/apps/viewer/src/main/java/org/skia/viewer/ViewerActivity.java @@ -0,0 +1,28 @@ +/* + * Copyright 2015 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +package org.skia.viewer; + +import android.app.ActionBar; +import android.os.Bundle; +import android.provider.Settings; +import android.view.View; +import android.view.WindowManager; + +public class ViewerActivity extends android.app.NativeActivity { + static { + System.loadLibrary("skia_android"); + } + + @Override + public void onCreate(Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + ActionBar ab = this.getActionBar(); + ab.hide(); + } +} diff --git a/platform_tools/android/apps/vulkanviewer/build.gradle b/platform_tools/android/apps/vulkanviewer/build.gradle deleted file mode 100644 index 731be4c3da..0000000000 --- a/platform_tools/android/apps/vulkanviewer/build.gradle +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2015 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ -apply plugin: 'com.android.application' -android { - compileSdkVersion 19 - buildToolsVersion "22.0.1" - defaultConfig { - applicationId "org.skia.vulkanviewer" - minSdkVersion 19 - targetSdkVersion 19 - versionCode 1 - versionName "1.0" - signingConfig signingConfigs.debug - } - sourceSets.main.jni.srcDirs = [] //disable automatic ndk-build call - sourceSets.main.jniLibs.srcDir "src/main/libs" - productFlavors { arm {}; arm64 {}; x86 {}; x86_64 {}; mips {}; mips64 {}; } - - setupSkiaLibraryBuild(project, applicationVariants, "--vulkan CopyVulkanViewerDeps", true) -} diff --git a/platform_tools/android/apps/vulkanviewer/src/main/AndroidManifest.xml b/platform_tools/android/apps/vulkanviewer/src/main/AndroidManifest.xml deleted file mode 100644 index 634c737083..0000000000 --- a/platform_tools/android/apps/vulkanviewer/src/main/AndroidManifest.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/platform_tools/android/apps/vulkanviewer/src/main/java/org/skia/vulkanviewer/VulkanViewerActivity.java b/platform_tools/android/apps/vulkanviewer/src/main/java/org/skia/vulkanviewer/VulkanViewerActivity.java deleted file mode 100644 index 38554ffdea..0000000000 --- a/platform_tools/android/apps/vulkanviewer/src/main/java/org/skia/vulkanviewer/VulkanViewerActivity.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2015 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -package org.skia.vulkanviewer; - -import android.app.ActionBar; -import android.os.Bundle; -import android.provider.Settings; -import android.view.View; -import android.view.WindowManager; - -public class VulkanViewerActivity extends android.app.NativeActivity { - static { - System.loadLibrary("skia_android"); - } - - @Override - public void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - ActionBar ab = this.getActionBar(); - ab.hide(); - } -} diff --git a/platform_tools/android/gyp/skia_android.gypi b/platform_tools/android/gyp/skia_android.gypi index 29342d97fd..844bd6ea26 100644 --- a/platform_tools/android/gyp/skia_android.gypi +++ b/platform_tools/android/gyp/skia_android.gypi @@ -49,7 +49,7 @@ }, 'includes' : [ 'canvasproof.gypi', - 'vulkanviewer.gypi', + 'viewer.gypi', ], 'targets': [ { diff --git a/platform_tools/android/gyp/viewer.gypi b/platform_tools/android/gyp/viewer.gypi new file mode 100644 index 0000000000..6d2659b2cb --- /dev/null +++ b/platform_tools/android/gyp/viewer.gypi @@ -0,0 +1,65 @@ +# Copyright 2015 Google Inc. +# +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +{ + 'targets': [ + { + 'target_name': 'CopyViewerDeps', + 'type': 'none', + 'dependencies': [ + 'skia_lib.gyp:skia_lib', + 'viewer.gyp:viewer', + ], + 'copies': [ + { + 'destination': '<(android_base)/apps/viewer/src/main/libs/<(android_arch)', + 'conditions': [ + [ 'skia_shared_lib', { + 'files': [ + '<(SHARED_LIB_DIR)/libskia_android.so', + '<(SHARED_LIB_DIR)/libviewer.so', + ]}, { + 'files': [ + '<(SHARED_LIB_DIR)/libviewer.so', + ]} + ], + ], + }, + ], + }, + { + 'target_name': 'Viewer_APK', + 'type': 'none', + 'dependencies': [ 'CopyViewerDeps', ], + 'actions': [ + { + 'action_name': 'SkiaViewer_apk', + 'inputs': [ + '<(android_base)/apps/viewer/src/main/AndroidManifest.xml', + '<(android_base)/apps/viewer/src/main/java/org/skia/viewer/ViewerActivity.java', + '<(android_base)/apps/viewer/src/main/libs/<(android_arch)/libviewer.so', + + ], + 'conditions': [ + [ 'skia_shared_lib', { + 'inputs': [ + '<(android_base)/apps/viewer/src/main/libs/<(android_arch)/libskia_android.so', + ], + }], + ], + 'outputs': [ + '../apps/viewer/build/outputs/apk/', + ], + 'action': [ + '<(android_base)/apps/gradlew', + ':viewer:assemble<(android_variant)<(android_buildtype)', + '-p<(android_base)/apps/viewer', + '-PsuppressNativeBuild', + '--daemon', + ], + }, + ], + }, + ], +} diff --git a/platform_tools/android/gyp/vulkanviewer.gypi b/platform_tools/android/gyp/vulkanviewer.gypi deleted file mode 100644 index b431e84269..0000000000 --- a/platform_tools/android/gyp/vulkanviewer.gypi +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 2015 Google Inc. -# -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -{ - 'targets': [ - { - 'target_name': 'CopyVulkanViewerDeps', - 'type': 'none', - 'dependencies': [ - 'skia_lib.gyp:skia_lib', - 'vulkanviewer.gyp:vulkanviewer', - ], - 'copies': [ - { - 'destination': '<(android_base)/apps/vulkanviewer/src/main/libs/<(android_arch)', - 'conditions': [ - [ 'skia_shared_lib', { - 'files': [ - '<(SHARED_LIB_DIR)/libskia_android.so', - '<(SHARED_LIB_DIR)/libvulkanviewer.so', - ]}, { - 'files': [ - '<(SHARED_LIB_DIR)/libvulkanviewer.so', - ]} - ], - ], - }, - ], - }, - { - 'target_name': 'VulkanViewer_APK', - 'type': 'none', - 'dependencies': [ 'CopyVulkanViewerDeps', ], - 'actions': [ - { - 'action_name': 'SkiaVulkanViewer_apk', - 'inputs': [ - '<(android_base)/apps/vulkanviewer/src/main/AndroidManifest.xml', - '<(android_base)/apps/vulkanviewer/src/main/java/com/skia/vulkanviewer/VulkanViewerActivity.java', - '<(android_base)/apps/vulkanviewer/src/main/libs/<(android_arch)/libvulkanviewer.so', - - ], - 'conditions': [ - [ 'skia_shared_lib', { - 'inputs': [ - '<(android_base)/apps/vulkanviewer/src/main/libs/<(android_arch)/libskia_android.so', - ], - }], - ], - 'outputs': [ - '../apps/vulkanviewer/build/outputs/apk/', - ], - 'action': [ - '<(android_base)/apps/gradlew', - ':vulkanviewer:assemble<(android_variant)<(android_buildtype)', - '-p<(android_base)/apps/vulkanviewer', - '-PsuppressNativeBuild', - '--daemon', - ], - }, - ], - }, - ], -} -- cgit v1.2.3