From ca8d349beed75d8fa6d27884cce4f091b6dc2a1e Mon Sep 17 00:00:00 2001
From: Tony-LunarG <tony@lunarg.com>
Date: Wed, 31 Oct 2018 16:10:48 -0600
Subject: Rename cube and cubepp exes to vkcube and vkcubepp

Change-Id: Iaecb0e7e21a086c8523b8cd4bc9eccd05e1cbca0
---
 cube/android/cube-with-layers/AndroidManifest.xml    | 4 ++--
 cube/android/cube-with-layers/custom_rules.xml       | 8 ++++----
 cube/android/cube-with-layers/res/values/strings.xml | 2 +-
 cube/android/cube/AndroidManifest.xml                | 4 ++--
 cube/android/cube/custom_rules.xml                   | 2 +-
 cube/android/cube/res/values/strings.xml             | 2 +-
 cube/android/jni/Android.mk                          | 2 +-
 cube/android/jni/Application.mk                      | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'cube/android')

diff --git a/cube/android/cube-with-layers/AndroidManifest.xml b/cube/android/cube-with-layers/AndroidManifest.xml
index 29c8d1a0..50b216e4 100644
--- a/cube/android/cube-with-layers/AndroidManifest.xml
+++ b/cube/android/cube-with-layers/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.CubeWithLayers" android:versionCode="1" android:versionName="1.0">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.VkCubeWithLayers" android:versionCode="1" android:versionName="1.0">
 
     <!-- Allow this app to read and write files (for use by tracing libraries). -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
@@ -16,7 +16,7 @@
              This will take care of integrating with our NDK code. -->
         <activity android:name="android.app.NativeActivity" android:label="@string/app_name" android:exported="true">
             <!-- Tell NativeActivity the name of or .so -->
-            <meta-data android:name="android.app.lib_name" android:value="Cube"/>
+            <meta-data android:name="android.app.lib_name" android:value="VkCube"/>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/cube/android/cube-with-layers/custom_rules.xml b/cube/android/cube-with-layers/custom_rules.xml
index ab517bfe..0ca5933e 100644
--- a/cube/android/cube-with-layers/custom_rules.xml
+++ b/cube/android/cube-with-layers/custom_rules.xml
@@ -5,21 +5,21 @@
 <property name="cubeDir" location="../libs" />
 <property name="layersDir" location="../../../build-android/libs" />
 
-<echo>CubeWithLayers: Creating libs-with-layers</echo>
+<echo>VkCubeWithLayers: Creating libs-with-layers</echo>
 <mkdir dir="${cubeWithLayersDir}"/>
 
-<echo>CubeWithLayers: Copying libs from demos/android</echo>
+<echo>VkCubeWithLayers: Copying libs from demos/android</echo>
 <copy todir="${cubeWithLayersDir}">
 <fileset dir="${cubeDir}"/>
 </copy>
 
-<echo>CubeWithLayers: Copying layers from build-android</echo>
+<echo>VkCubeWithLayers: Copying layers from build-android</echo>
 <copy todir="${cubeWithLayersDir}">
 <fileset dir="${layersDir}"/>
 </copy>
 
 <!-- Point ndk-build at the libs-with-layers common dir -->
-<echo>CubeWithLayers: Overriding native.libs.absolute.dir with ${cubeWithLayersDir}</echo>
+<echo>VkCubeWithLayers: Overriding native.libs.absolute.dir with ${cubeWithLayersDir}</echo>
 <property name="native.libs.absolute.dir" location="${cubeWithLayersDir}" />
 
 </project>
diff --git a/cube/android/cube-with-layers/res/values/strings.xml b/cube/android/cube-with-layers/res/values/strings.xml
index bdf81e5b..ecd779e4 100644
--- a/cube/android/cube-with-layers/res/values/strings.xml
+++ b/cube/android/cube-with-layers/res/values/strings.xml
@@ -19,6 +19,6 @@
 
 <resources>
     <!-- Simple strings. -->
-    <string name="app_name">CubeWithLayers</string>
+    <string name="app_name">VkCubeWithLayers</string>
 
 </resources>
diff --git a/cube/android/cube/AndroidManifest.xml b/cube/android/cube/AndroidManifest.xml
index 6ac0c8a3..1bf9080b 100644
--- a/cube/android/cube/AndroidManifest.xml
+++ b/cube/android/cube/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.Cube" android:versionCode="1" android:versionName="1.0">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.VkCube" android:versionCode="1" android:versionName="1.0">
 
     <!-- Allow this app to read and write files (for use by tracing libraries). -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
@@ -16,7 +16,7 @@
              This will take care of integrating with our NDK code. -->
         <activity android:name="android.app.NativeActivity" android:label="@string/app_name" android:exported="true">
             <!-- Tell NativeActivity the name of or .so -->
-            <meta-data android:name="android.app.lib_name" android:value="Cube"/>
+            <meta-data android:name="android.app.lib_name" android:value="VkCube"/>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/cube/android/cube/custom_rules.xml b/cube/android/cube/custom_rules.xml
index 335c1c34..31eb31ad 100644
--- a/cube/android/cube/custom_rules.xml
+++ b/cube/android/cube/custom_rules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="NativeActivity" default="help">
 <!-- Point ndk-build at the libs created in common dir -->
-<echo>cube: Overriding native.libs.absolute.dir with ../libs</echo>
+<echo>vkcube: Overriding native.libs.absolute.dir with ../libs</echo>
 <property name="native.libs.absolute.dir" location="../libs" />
 </project>
diff --git a/cube/android/cube/res/values/strings.xml b/cube/android/cube/res/values/strings.xml
index 7f175a60..8adead25 100644
--- a/cube/android/cube/res/values/strings.xml
+++ b/cube/android/cube/res/values/strings.xml
@@ -19,6 +19,6 @@
 
 <resources>
     <!-- Simple strings. -->
-    <string name="app_name">Cube</string>
+    <string name="app_name">VkCube</string>
 
 </resources>
diff --git a/cube/android/jni/Android.mk b/cube/android/jni/Android.mk
index 25828cf9..cc4b93ce 100644
--- a/cube/android/jni/Android.mk
+++ b/cube/android/jni/Android.mk
@@ -18,7 +18,7 @@ SRC_DIR := $(LOCAL_PATH)/../../..
 DEMO_DIR := $(SRC_DIR)/cube
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := Cube
+LOCAL_MODULE := VkCube
 LOCAL_SRC_FILES += $(DEMO_DIR)/cube.c \
                    $(SRC_DIR)/common/vulkan_wrapper.cpp \
                    $(SRC_DIR)/common/android_util.cpp
diff --git a/cube/android/jni/Application.mk b/cube/android/jni/Application.mk
index e215f210..cd664539 100644
--- a/cube/android/jni/Application.mk
+++ b/cube/android/jni/Application.mk
@@ -16,7 +16,7 @@
 APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
 APP_PLATFORM := android-23
 APP_STL := gnustl_static
-APP_MODULES := Cube
+APP_MODULES := VkCube
 APP_CPPFLAGS += -std=c++11 -fexceptions -Wall -Werror -Wextra -Wno-unused-parameter -DVK_NO_PROTOTYES -DGLM_FORCE_RADIANS
 APP_CFLAGS += -Wall -Werror -Wextra -Wno-unused-parameter -DVK_NO_PROTOTYES -DGLM_FORCE_RADIANS
 NDK_TOOLCHAIN_VERSION := clang
-- 
cgit v1.2.3