omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update android project and link issue because previously removed the app_dummy

Browse Source
This commit is contained in:
omigamedev
2018-10-09 13:05:26 +02:00
parent b4c986d273
commit f3f22bdd85
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
android/build.gradle
View File

@@ -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"
}