From c8780b573013c4e786c857e15d15088067b6adb5 Mon Sep 17 00:00:00 2001
From: Cody Northrop <cnorthrop@google.com>
Date: Thu, 29 Sep 2016 13:55:08 -0600
Subject: [PATCH] demos: Remove tri from Android build

---
 demos/android/jni/Android.mk             | 13 -------------
 demos/android/jni/Application.mk         |  2 +-
 demos/android/tri/AndroidManifest.xml    | 27 ---------------------------
 demos/android/tri/custom_rules.xml       |  6 ------
 demos/android/tri/res/values/strings.xml | 24 ------------------------
 5 files changed, 1 insertion(+), 71 deletions(-)
 delete mode 100644 demos/android/tri/AndroidManifest.xml
 delete mode 100644 demos/android/tri/custom_rules.xml
 delete mode 100644 demos/android/tri/res/values/strings.xml

diff --git a/demos/android/jni/Android.mk b/demos/android/jni/Android.mk
index 51cf0ba..3e4169b 100644
--- a/demos/android/jni/Android.mk
+++ b/demos/android/jni/Android.mk
@@ -18,19 +18,6 @@ SRC_DIR := $(LOCAL_PATH)/../../..
 DEMO_DIR := $(SRC_DIR)/demos
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := Tri
-LOCAL_SRC_FILES += $(DEMO_DIR)/tri.c \
-                   $(SRC_DIR)/common/vulkan_wrapper.cpp
-LOCAL_C_INCLUDES += $(SRC_DIR)/include \
-                    $(DEMO_DIR)/android/include \
-                    $(SRC_DIR)/libs \
-                    $(SRC_DIR)/common
-LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR --include=$(SRC_DIR)/common/vulkan_wrapper.h
-LOCAL_WHOLE_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_LDLIBS    := -llog -landroid
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
 LOCAL_MODULE := Cube
 LOCAL_SRC_FILES += $(DEMO_DIR)/cube.c \
                    $(SRC_DIR)/common/vulkan_wrapper.cpp \
diff --git a/demos/android/jni/Application.mk b/demos/android/jni/Application.mk
index 2571d5a..e991843 100644
--- a/demos/android/jni/Application.mk
+++ b/demos/android/jni/Application.mk
@@ -16,7 +16,7 @@
 APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 mips mips64
 APP_PLATFORM := android-23
 APP_STL := gnustl_static
-APP_MODULES := Tri Cube
+APP_MODULES := Cube
 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
diff --git a/demos/android/tri/AndroidManifest.xml b/demos/android/tri/AndroidManifest.xml
deleted file mode 100644
index 00ff122..0000000
--- a/demos/android/tri/AndroidManifest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.Tri" 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"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
-
-    <!-- This is the platform API where NativeActivity was introduced. -->
-    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="23"/>
-
-    <!-- This .apk has no Java code itself, so set hasCode to false. -->
-    <application android:label="@string/app_name" android:hasCode="false" android:debuggable='true'>
-
-        <!-- Our activity is the built-in NativeActivity framework class.
-             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="Tri"/>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
diff --git a/demos/android/tri/custom_rules.xml b/demos/android/tri/custom_rules.xml
deleted file mode 100644
index 335c1c3..0000000
--- a/demos/android/tri/custom_rules.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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>
-<property name="native.libs.absolute.dir" location="../libs" />
-</project>
diff --git a/demos/android/tri/res/values/strings.xml b/demos/android/tri/res/values/strings.xml
deleted file mode 100644
index 4c62bab..0000000
--- a/demos/android/tri/res/values/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- This file contains resource definitions for displayed strings, allowing
-     them to be changed based on the locale and options. -->
-
-<resources>
-    <!-- Simple strings. -->
-    <string name="app_name">Tri</string>
-
-</resources>
-- 
2.7.4