Skip to content

Commit 3f4feb4

Browse files
authored
Correct CMake, remove irrelevant code
1 parent 7f944a0 commit 3f4feb4

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,6 @@ if(NBL_BUILD_ANDROID)
127127

128128
#option(STRIP_ANDROID_LIBRARY "Strip the resulting android library" OFF)
129129

130-
if(NOT ANDROID_PLATFORM)
131-
set(ANDROID_PLATFORM "android-25")
132-
endif()
133130
string(SUBSTRING
134131
"${ANDROID_PLATFORM}"
135132
8 # length of "android-"
@@ -160,7 +157,11 @@ if(NBL_BUILD_ANDROID)
160157
unset(__buildTools)
161158
endif()
162159
set(ANDROID_BUILD_TOOLS "${ANDROID_SDK_ROOT_PATH}/build-tools/${ANDROID_BUILD_TOOLS_VERSION}")
160+
if(MSVC)
163161
set(ANDROID_JAVA_BIN "${JAVA_HOME}")
162+
else()
163+
set(ANDROID_JAVA_BIN "${JAVA_HOME}/bin")
164+
endif()
164165
set(ANDROID_JAVA_RT_JAR "${JAVA_HOME}/jre/lib/rt.jar")
165166

166167
set(ANDROID_APK_TARGET_ID "" CACHE STRING "The Target ID to build the APK for like 'android-99', use <android list targets> to choose another one.")

0 commit comments

Comments
 (0)