From 87b979f51c9e08521349dcfd570b303841de326f Mon Sep 17 00:00:00 2001
From: bjorn <tie.372@gmail.com>
Date: Mon, 27 Jul 2020 12:49:41 -0600
Subject: [PATCH] mv Activity.java Activity_vrapi.java;

---
 .gitignore                                           | 1 +
 CMakeLists.txt                                       | 2 +-
 src/resources/{Activity.java => Activity_vrapi.java} | 0
 3 files changed, 2 insertions(+), 1 deletion(-)
 rename src/resources/{Activity.java => Activity_vrapi.java} (100%)

diff --git a/.gitignore b/.gitignore
index e8b275c9..dd6f0840 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ config/*
 *.ttf.h
 *.json.h
 *.lua.h
+Activity*.java
 AndroidManifest*.xml
 /build.sh
 /watch.sh
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4eba95f8..31bc9f8c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -650,7 +650,7 @@ elseif(ANDROID)
       POST_BUILD
       BYPRODUCTS lovr.apk
       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/Activity.java Activity.java
+      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/Activity_${ANDROID_ACTIVITY}.java Activity.java
       COMMAND ${Java_JAVAC_EXECUTABLE} -classpath "${ANDROID_JAR}" -d . Activity.java
       COMMAND ${ANDROID_TOOLS}/dx --dex --output classes.dex org/lovr/app/Activity.class
       COMMAND
diff --git a/src/resources/Activity.java b/src/resources/Activity_vrapi.java
similarity index 100%
rename from src/resources/Activity.java
rename to src/resources/Activity_vrapi.java