From d25e20fb9d353e1cce827cc7336ee69bfc9770ef Mon Sep 17 00:00:00 2001 From: bjorn Date: Mon, 27 Jul 2020 13:47:32 -0600 Subject: [PATCH] mv AndroidManifest.xml AndroidManifest_vrapi.xml; --- CMakeLists.txt | 2 +- .../{AndroidManifest.xml => AndroidManifest_vrapi.xml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/resources/{AndroidManifest.xml => AndroidManifest_vrapi.xml} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 84717ae6..cd1bdce9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,7 +75,6 @@ elseif(ANDROID) find_package(Java REQUIRED) set(LOVR_USE_OPENVR OFF) set(LOVR_USE_DESKTOP_HEADSET OFF) - set(ANDROID_MANIFEST "${CMAKE_CURRENT_SOURCE_DIR}/src/resources/AndroidManifest.xml" CACHE STRING "An optional path to a custom AndroidManifest.xml") if(LOVR_BUILD_EXE) set(LOVR_BUILD_SHARED ON) endif() @@ -642,6 +641,7 @@ elseif(ANDROID) if(LOVR_USE_VRAPI) get_target_property(VRAPI_LIB ${LOVR_VRAPI} IMPORTED_LOCATION) file(COPY ${VRAPI_LIB} DESTINATION lib/${ANDROID_ABI}) + set(ANDROID_MANIFEST "${CMAKE_CURRENT_SOURCE_DIR}/src/resources/AndroidManifest_vrapi.xml" CACHE STRING "The AndroidManifest.xml path") set(ANDROID_ACTIVITY "vrapi") endif() diff --git a/src/resources/AndroidManifest.xml b/src/resources/AndroidManifest_vrapi.xml similarity index 100% rename from src/resources/AndroidManifest.xml rename to src/resources/AndroidManifest_vrapi.xml