From b47f250e6cb70c3b8350b146c10ab010772e27a0 Mon Sep 17 00:00:00 2001
From: saschawillems <webmaster@saschawillems.de>
Date: Sat, 18 Mar 2017 16:16:56 +0100
Subject: [PATCH] Android build files [skip ci]

---
 android/occlusionquery/build.py    | 4 ----
 android/pbribl/AndroidManifest.xml | 6 +++---
 android/pbribl/build.py            | 2 +-
 android/pbribl/jni/Android.mk      | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/android/occlusionquery/build.py b/android/occlusionquery/build.py
index 2f6ab4d6..56770ae2 100644
--- a/android/occlusionquery/build.py
+++ b/android/occlusionquery/build.py
@@ -4,10 +4,6 @@ import subprocess
 import sys
 import glob
 
-sys.path.append('../base/')
-
-import base
-
 APK_NAME = "vulkanOcclusionquery"
 APP_TITLE = "Occlusion queries"
 SHADER_DIR = "occlusionquery"
diff --git a/android/pbribl/AndroidManifest.xml b/android/pbribl/AndroidManifest.xml
index 75fc78c1..f0673290 100644
--- a/android/pbribl/AndroidManifest.xml
+++ b/android/pbribl/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-		package="de.saschawillems.vulkanPBRBIBL"
+		package="de.saschawillems.vulkanPBRIBL"
         android:versionCode="1"
         android:versionName="1.0">
 
@@ -10,14 +10,14 @@
     <uses-feature android:name="android.hardware.gamepad" android:required="false"/>
     <uses-feature android:name="android.software.leanback" android:required="false"/>
 
-    <application android:label="vulkanPBRBIBL" android:icon="@drawable/icon" android:hasCode="false">
+    <application android:label="vulkanPBRIBL" android:icon="@drawable/icon" android:hasCode="false">
 		<activity android:name="android.app.NativeActivity"
                 android:label="PBR Image based lighting"
                 android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				android:launchMode="singleTask"
                 android:screenOrientation="landscape"                
                 android:configChanges="orientation|screenSize|keyboardHidden">
-			<meta-data android:name="android.app.lib_name" android:value="vulkanPBRBIBL" />
+			<meta-data android:name="android.app.lib_name" android:value="vulkanPBRIBL" />
 			<intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/android/pbribl/build.py b/android/pbribl/build.py
index 752f2142..5e01aeac 100644
--- a/android/pbribl/build.py
+++ b/android/pbribl/build.py
@@ -4,7 +4,7 @@ import subprocess
 import sys
 import glob
 
-APK_NAME = "vulkanPBRBIBL"
+APK_NAME = "vulkanPBRIBL"
 SHADER_DIR = "pbribl"
 ASSETS_MODELS = ["cube.obj", "geosphere.obj", "teapot.dae", "torusknot.obj", "venus.fbx"]
 ASSETS_TEXTURES = ["hamarikyu_bridge_radiance_cube.ktx", "hamarikyu_bridge_irradiance_cube.ktx"]
diff --git a/android/pbribl/jni/Android.mk b/android/pbribl/jni/Android.mk
index 4abf2833..5aecd1b7 100644
--- a/android/pbribl/jni/Android.mk
+++ b/android/pbribl/jni/Android.mk
@@ -14,7 +14,7 @@ DATADIR := $(LOCAL_PATH)/../../data
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := vulkanPBRBIBL
+LOCAL_MODULE := vulkanPBRIBL
 
 PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../pbribl/*.cpp)
 PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)