Skip to content

Add -PHAVE_CS4 Gradle property for Android CS4 builds (follow-up to #1476) #1477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bmehta001 wants to merge 2 commits into from
+19 −1
Closed

Add -PHAVE_CS4 Gradle property for Android CS4 builds (follow-up to #1476) #1477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a969a5c
Add -PHAVE_CS4 Gradle property for Android CS4 builds
bmehta001 Jun 11, 2026
b4fd4fe
android: address Copilot round-1 - CS4_FULL also enables base CS4
bmehta001 Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/android_build/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ org.gradle.jvmargs=-Xmx1536m
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
# Uncomment CXXFLAGS to set CXX flags
# Enable Common Schema 4.0 via the dedicated property (preferred):
# ./gradlew <task> -PHAVE_CS4=1 (or -PHAVE_CS4_FULL=1)
# Or pass arbitrary CXX flags via CXXFLAGS (uncomment):
# CXXFLAGS=-DHAVE_CS4=1

16 changes: 16 additions & 0 deletions lib/android_build/maesdk/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,22 @@ android {
if (!cxxFlag.isEmpty()) {
args.add("-DCMAKE_CXX_FLAGS=\"" + cxxFlag + "\"")
}
// Common Schema 4.0: -PHAVE_CS4=1 (or HAVE_CS4 env) maps to the
// MATSDK_HAVE_CS4 CMake option (preferred over a raw CXX flag, and
// propagated to consumers via the exported target). HAVE_CS4_FULL
// adds the server/service extensions.
String haveCs4 = project.findProperty("HAVE_CS4") ?: System.getenv("HAVE_CS4") ?: ""
String haveCs4Full = project.findProperty("HAVE_CS4_FULL") ?: System.getenv("HAVE_CS4_FULL") ?: ""
boolean cs4Full = haveCs4Full.equalsIgnoreCase("1") || haveCs4Full.equalsIgnoreCase("true") || haveCs4Full.equalsIgnoreCase("on")
// CS4_FULL implies CS4, so enable the base option too rather than
// relying on the CMake-side implication.
boolean cs4 = cs4Full || haveCs4.equalsIgnoreCase("1") || haveCs4.equalsIgnoreCase("true") || haveCs4.equalsIgnoreCase("on")
if (cs4) {
args.add("-DMATSDK_HAVE_CS4=ON")
}
if (cs4Full) {
args.add("-DMATSDK_HAVE_CS4_FULL=ON")
}
// Passes optional arguments to CMake.
arguments args.toArray(new String[args.size()])
println "cmake flag: " + arguments
Expand Down
Loading