Skip to content

Commit 2aade07

Browse files
authored
Pass CXX_FLAGS from properties to maesdk module (#1137)
1 parent 916eee2 commit 2aade07

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

lib/android_build/gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,6 @@ org.gradle.jvmargs=-Xmx1536m
1717
android.useAndroidX=true
1818
# Automatically convert third-party libraries to use AndroidX
1919
android.enableJetifier=true
20+
# Uncomment CXXFLAGS to set CXX flags
21+
# CXXFLAGS=-DHAVE_CS4=1
2022

lib/android_build/maesdk/build.gradle

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,20 @@ android {
1515
if(!ext.has("build_cpp_client") || ext.build_cpp_client) {
1616
externalNativeBuild {
1717
cmake {
18+
String cxxFlag = project.findProperty("CXXFLAGS") ?: System.getenv("CXXFLAGS") ?: ""
19+
ArrayList<String> args = new ArrayList<String>()
20+
args.add("-DANDROID_STL=c++_shared")
21+
args.add("-DBUILD_SHARED_LIBS=1")
22+
args.add("-DUSE_ROOM=1")
23+
String linkerFlag = project.findProperty("CMAKE_SHARED_LINKER_FLAGS") ?: ""
24+
linkerFlag = "-DCMAKE_SHARED_LINKER_FLAGS=" + linkerFlag
25+
args.add(linkerFlag)
26+
if (!cxxFlag.isEmpty()) {
27+
args.add("-DCMAKE_CXX_FLAGS=\"" + cxxFlag + "\"")
28+
}
1829
// Passes optional arguments to CMake.
19-
arguments "-DANDROID_STL=c++_shared", "-DBUILD_SHARED_LIBS=1", "-DUSE_ROOM=1", "-DCMAKE_SHARED_LINKER_FLAGS=${project.findProperty("CMAKE_SHARED_LINKER_FLAGS") ?: ''}"
30+
arguments args.toArray(new String[args.size()])
31+
println "cmake flag: " + arguments
2032
}
2133
}
2234
}

0 commit comments

Comments
 (0)