File tree Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -127,9 +127,6 @@ if(NBL_BUILD_ANDROID)
127
127
128
128
#option(STRIP_ANDROID_LIBRARY "Strip the resulting android library" OFF)
129
129
130
- if (NOT ANDROID_PLATFORM )
131
- set (ANDROID_PLATFORM "android-25" )
132
- endif ()
133
130
string (SUBSTRING
134
131
"${ANDROID_PLATFORM} "
135
132
8 # length of "android-"
@@ -160,7 +157,11 @@ if(NBL_BUILD_ANDROID)
160
157
unset (__buildTools )
161
158
endif ()
162
159
set (ANDROID_BUILD_TOOLS "${ANDROID_SDK_ROOT_PATH} /build-tools/${ANDROID_BUILD_TOOLS_VERSION} " )
160
+ if (MSVC )
163
161
set (ANDROID_JAVA_BIN "${JAVA_HOME} " )
162
+ else ()
163
+ set (ANDROID_JAVA_BIN "${JAVA_HOME} /bin" )
164
+ endif ()
164
165
set (ANDROID_JAVA_RT_JAR "${JAVA_HOME} /jre/lib/rt.jar" )
165
166
166
167
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." )
You can’t perform that action at this time.
0 commit comments