diff --git a/.github/workflows/apk.yml b/.github/workflows/apk.yml index 6757f51f..486d26b5 100644 --- a/.github/workflows/apk.yml +++ b/.github/workflows/apk.yml @@ -47,14 +47,14 @@ jobs: run: python update_glslang_sources.py - name: Build plugin APKs - run: gradle --no-daemon -p android-plugin :app:assembleEsprytPluginRelease :app:assembleMagmaPluginRelease --parallel --max-workers "$(nproc)" + run: gradle --no-daemon -p android-plugin :app:assembleEsprytPluginRelease :app:assembleMagmaPluginRelease -Pmobilegl.logLevel=MOBILEGL_LOG_LEVEL_INFO --parallel --max-workers "$(nproc)" env: SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }} SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }} SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }} - name: Build retrace APKs - run: gradle --no-daemon -p android-plugin :app:assembleEsprytTraceRelease :app:assembleMagmaTraceRelease -Pmobilegl.abis=all -Pmobilegl.debuggableRelease=true --parallel --max-workers "$(nproc)" + run: gradle --no-daemon -p android-plugin :app:assembleEsprytTraceRelease :app:assembleMagmaTraceRelease -Pmobilegl.abis=all -Pmobilegl.debuggableRelease=true -Pmobilegl.logLevel=MOBILEGL_LOG_LEVEL_INFO --parallel --max-workers "$(nproc)" env: SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }} SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d5db98ad..c29e97f2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -63,6 +63,7 @@ jobs: -DCMAKE_C_COMPILER=clang-20 \ -DCMAKE_CXX_COMPILER=clang++-20 \ -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" \ + -DMOBILEGL_LOG_ACTIVE_LEVEL=MOBILEGL_LOG_LEVEL_INFO \ -DMOBILEGL_BUILD_TEST=ON \ -DMOBILEGL_BUILD_BENCHMARK=ON \ -DMOBILEGL_BUILD_TRACE_REPLAY=OFF \ @@ -254,6 +255,7 @@ jobs: -DCMAKE_C_COMPILER=clang-20 \ -DCMAKE_CXX_COMPILER=clang++-20 \ -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" \ + -DMOBILEGL_LOG_ACTIVE_LEVEL=MOBILEGL_LOG_LEVEL_INFO \ -DMOBILEGL_BUILD_TEST=OFF \ -DMOBILEGL_BUILD_BENCHMARK=OFF \ -DMOBILEGL_BUILD_TRACE_REPLAY=ON \ diff --git a/CMakeLists.txt b/CMakeLists.txt index df3729ec..aa7c791e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,7 @@ option(MOBILEGL_BUILD_BENCHMARK "Build MobileGL benchmarks" option(MOBILEGL_FORCE_RELEASE_OPT "Enable Release optimization flags in Debug build" ON ) option(MOBILEGL_ENABLE_TRACY "Enable tracy for profiling" OFF) option(MOBILEGL_BUILD_TRACE_REPLAY "Build Linux apitrace replay runner" OFF) +set(MOBILEGL_LOG_ACTIVE_LEVEL "MOBILEGL_LOG_LEVEL_INFO" CACHE STRING "MobileGL active log level macro") if (ANDROID) set(MOBILEGL_BUILD_TEST OFF CACHE BOOL "Build MobileGL tests" FORCE) @@ -330,6 +331,7 @@ target_link_libraries(${CMAKE_PROJECT_NAME} target_compile_definitions(${CMAKE_PROJECT_NAME} PUBLIC ${MOBILEGL_COMPILE_DEF} + MOBILEGL_LOG_ACTIVE_LEVEL=${MOBILEGL_LOG_ACTIVE_LEVEL} ) if(NOT ANDROID) @@ -363,6 +365,7 @@ if(NOT ANDROID) target_compile_definitions(${CMAKE_PROJECT_NAME}_s PUBLIC ${MOBILEGL_COMPILE_DEF} + MOBILEGL_LOG_ACTIVE_LEVEL=${MOBILEGL_LOG_ACTIVE_LEVEL} ) endif() diff --git a/android-plugin/build.gradle b/android-plugin/build.gradle index 7aebeb20..ccbd920e 100644 --- a/android-plugin/build.gradle +++ b/android-plugin/build.gradle @@ -14,6 +14,10 @@ def mobileGlAbiFilters = { .findAll { !it.isEmpty() } } +def mobileGlLogActiveLevel = { + (rootProject.findProperty('mobilegl.logLevel') ?: System.getenv('MOBILEGL_LOG_ACTIVE_LEVEL') ?: 'MOBILEGL_LOG_LEVEL_INFO') as String +} + subprojects { subproject -> subproject.plugins.withId('com.android.library') { subproject.android { @@ -26,7 +30,7 @@ subprojects { subproject -> } externalNativeBuild { cmake { - cppFlags '-DMOBILEGL_LOG_ACTIVE_LEVEL=MOBILEGL_LOG_LEVEL_INFO' + cppFlags "-DMOBILEGL_LOG_ACTIVE_LEVEL=${mobileGlLogActiveLevel()}" } } }