update android project and link issue because previously removed the app_dummy
This commit is contained in:
@@ -17,7 +17,7 @@ add_library(
|
||||
# automatically packages shared libraries with your APK.
|
||||
|
||||
# now build app's shared lib
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
|
||||
|
||||
add_library(
|
||||
native-lib SHARED
|
||||
|
||||
@@ -27,15 +27,13 @@ apply plugin: "com.gladed.androidgitversion"
|
||||
|
||||
def getCurrentFlavor() {
|
||||
Gradle gradle = getGradle()
|
||||
|
||||
if (gradle.getStartParameter().getTaskRequests().args.size() == 0)
|
||||
return ""
|
||||
String tskReqStr = gradle.getStartParameter().getTaskRequests().args[0][0]
|
||||
Pattern pattern;
|
||||
Pattern pattern
|
||||
|
||||
if( tskReqStr.contains( "assemble" ) )
|
||||
pattern = Pattern.compile("assemble(\\w*)(Release|Debug)")
|
||||
else
|
||||
pattern = Pattern.compile("generate(\\w*)(Release|Debug)")
|
||||
pattern = Pattern.compile("(\\w*)(Release|Debug)")
|
||||
|
||||
Matcher matcher = pattern.matcher( tskReqStr )
|
||||
|
||||
@@ -44,7 +42,7 @@ def getCurrentFlavor() {
|
||||
else
|
||||
{
|
||||
println "NO MATCH FOUND"
|
||||
return "";
|
||||
return ""
|
||||
}
|
||||
}
|
||||
|
||||
@@ -54,7 +52,7 @@ def flavor_cap = getCurrentFlavor().capitalize()
|
||||
Properties properties = new Properties()
|
||||
properties.load(project.rootProject.file('local.properties').newDataInputStream())
|
||||
def sdkDir = properties.getProperty("sdk.dir")
|
||||
def classpath = "build/intermediates/javac/${flavor}/compile${flavor_cap}JavaWithJavac/classes:${sdkDir}/platforms/android-26/android.jar"
|
||||
def classpath = "build/intermediates/javac/${flavor}/compile${flavor_cap}JavaWithJavac/classes;${sdkDir}/platforms/android-26/android.jar"
|
||||
def activity = "com.omixlab.panopainter.MainActivity"
|
||||
def outpath = "src/main/cpp"
|
||||
|
||||
@@ -88,7 +86,7 @@ android {
|
||||
//cppFlags "-D__STDC_FORMAT_MACROS"
|
||||
arguments "-DANDROID_TOOLCHAIN=clang",
|
||||
//"-DANDROID_PLATFORM=android-19",
|
||||
"-DANDROID_STL=gnustl_static",
|
||||
"-DANDROID_STL=c++_shared",
|
||||
"-DCMAKE_BUILD_TYPE=${flavor_cap}",
|
||||
"-DANDROID_ARM_NEON=TRUE"
|
||||
}
|
||||
|
||||
@@ -941,6 +941,10 @@ static void engine_handle_cmd(struct android_app* app, int32_t cmd) {
|
||||
void android_main(struct android_app* state) {
|
||||
struct engine engine;
|
||||
|
||||
// Make sure glue isn't stripped.
|
||||
// DON'T REMOVE, even if the compiler say it's deprecated
|
||||
app_dummy();
|
||||
|
||||
memset(&engine, 0, sizeof(engine));
|
||||
state->userData = &engine;
|
||||
state->onAppCmd = engine_handle_cmd;
|
||||
|
||||
Reference in New Issue
Block a user