mirror of
https://github.com/MobileGL-Dev/MobileGL
synced 2026-11-20 08:21:56 +09:00
[Build] (P13 W2): push by default, drop the Gradle pipePush switch so FCL embeds the push monolith
This commit is contained in:
@@ -106,7 +106,6 @@ jobs:
|
|||||||
-Pmobilegl.apkSuffix="${GITHUB_SHA}" -Pmobilegl.logLevel=MOBILEGL_LOG_LEVEL_INFO
|
-Pmobilegl.apkSuffix="${GITHUB_SHA}" -Pmobilegl.logLevel=MOBILEGL_LOG_LEVEL_INFO
|
||||||
-Pmobilegl.buildDisaggregated="${MOBILEGL_CI_DISAGGREGATED}"
|
-Pmobilegl.buildDisaggregated="${MOBILEGL_CI_DISAGGREGATED}"
|
||||||
-Pmobilegl.buildDisaggregatedInproc="${MOBILEGL_CI_DISAGGREGATED}"
|
-Pmobilegl.buildDisaggregatedInproc="${MOBILEGL_CI_DISAGGREGATED}"
|
||||||
-Pmobilegl.pipePush="${MOBILEGL_CI_DISAGGREGATED}"
|
|
||||||
--parallel --max-workers "$(nproc)"
|
--parallel --max-workers "$(nproc)"
|
||||||
env:
|
env:
|
||||||
SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
|
SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
|
||||||
@@ -155,7 +154,6 @@ jobs:
|
|||||||
-Pmobilegl.debuggableRelease=true -Pmobilegl.logLevel=MOBILEGL_LOG_LEVEL_INFO
|
-Pmobilegl.debuggableRelease=true -Pmobilegl.logLevel=MOBILEGL_LOG_LEVEL_INFO
|
||||||
-Pmobilegl.buildDisaggregated="${MOBILEGL_CI_DISAGGREGATED}"
|
-Pmobilegl.buildDisaggregated="${MOBILEGL_CI_DISAGGREGATED}"
|
||||||
-Pmobilegl.buildDisaggregatedInproc="${MOBILEGL_CI_DISAGGREGATED}"
|
-Pmobilegl.buildDisaggregatedInproc="${MOBILEGL_CI_DISAGGREGATED}"
|
||||||
-Pmobilegl.pipePush="${MOBILEGL_CI_DISAGGREGATED}"
|
|
||||||
--parallel --max-workers "$(nproc)"
|
--parallel --max-workers "$(nproc)"
|
||||||
env:
|
env:
|
||||||
SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
|
SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
|
||||||
|
|||||||
+4
-4
@@ -31,10 +31,10 @@ option(MOBILEGL_BUILD_DISAGGREGATED_INPROC "Compile the in-process (one-process,
|
|||||||
option(MOBILEGL_BUILD_SERVER_SPIKE "Build the P0 spike-A MobileGLServer delivery-chain executable (Android only)" OFF)
|
option(MOBILEGL_BUILD_SERVER_SPIKE "Build the P0 spike-A MobileGLServer delivery-chain executable (Android only)" OFF)
|
||||||
option(MOBILEGL_BUILD_EXTMEM_PROBE "Package tools/spikes/extmem_probe as libMobileGLExtmemProbe.so for the trace APK's exec hook (P11 A3, Android only)" OFF)
|
option(MOBILEGL_BUILD_EXTMEM_PROBE "Package tools/spikes/extmem_probe as libMobileGLExtmemProbe.so for the trace APK's exec hook (P11 A3, Android only)" OFF)
|
||||||
option(MOBILEGL_EXTMEM_PROBE_AS_SERVER "Spike only (P11 B2 step 1): also package the probe as libMobileGLServer.so, the real server as libMobileGLServerReal.so" OFF)
|
option(MOBILEGL_EXTMEM_PROBE_AS_SERVER "Spike only (P11 B2 step 1): also package the probe as libMobileGLServer.so, the real server as libMobileGLServerReal.so" OFF)
|
||||||
# The PipeInputs strangler (ARCHITECTURE.md 9.2). OFF is the pull build and must stay
|
# The PipeInputs strangler (ARCHITECTURE.md 9.2). ON since P13 W2: every build, the FCL-embedded
|
||||||
# byte-identical to a tree without either option: MGB_CTX is the live GLContext, no
|
# monolith included, pushes. OFF is the retired pull build, kept selectable only until P13 W3a
|
||||||
# MGPipe/PipeInputs source is compiled, every MGP_FILL is ((void)0).
|
# deletes the option (PLAN-P13 §6); nothing ships it and CI no longer builds it.
|
||||||
option(MOBILEGL_PIPE_PUSH "Backends read frontend state through the MGPipe PipeInputs block instead of MG_State::pGLContext (ARCHITECTURE.md 9.2 phase A)" OFF)
|
option(MOBILEGL_PIPE_PUSH "Backends read frontend state through the MGPipe PipeInputs block instead of MG_State::pGLContext (ARCHITECTURE.md 9.2 phase A)" ON)
|
||||||
option(MOBILEGL_PIPE_VERIFY "Compile SnapshotFromGLContext() and the G4 per-verb shadow comparator; implies MOBILEGL_PIPE_PUSH; never shipped" OFF)
|
option(MOBILEGL_PIPE_VERIFY "Compile SnapshotFromGLContext() and the G4 per-verb shadow comparator; implies MOBILEGL_PIPE_PUSH; never shipped" OFF)
|
||||||
# Track H's old-versus-new arm (ARCHITECTURE.md 9.6). With a MOBILEGL_PIPE_PUSH bit clear
|
# Track H's old-versus-new arm (ARCHITECTURE.md 9.6). With a MOBILEGL_PIPE_PUSH bit clear
|
||||||
# the backend would still run the RE-KEYED memo code, so the bitmask alone stops being a
|
# the backend would still run the RE-KEYED memo code, so the bitmask alone stops being a
|
||||||
|
|||||||
+3
-7
@@ -39,12 +39,9 @@ def mobileGlExtmemProbeAsServer = {
|
|||||||
// build ship it, so there the split shape is ON unless a build opts out with
|
// build ship it, so there the split shape is ON unless a build opts out with
|
||||||
// -Pmobilegl.buildDisaggregated=OFF. The runtime transport is unaffected: the app's
|
// -Pmobilegl.buildDisaggregated=OFF. The runtime transport is unaffected: the app's
|
||||||
// MOBILEGL_TRANSPORT env stays opt-in (app/build.gradle.kts), so the monolith path is still the
|
// MOBILEGL_TRANSPORT env stays opt-in (app/build.gradle.kts), so the monolith path is still the
|
||||||
// default. The FCL-embedded library keeps its old defaults (pull, no MG_Remote): FCL packages
|
// default. The FCL-embedded library is the push monolith without MG_Remote (P13 W2, ID-P13-1):
|
||||||
// neither the server nor its screen.
|
// FCL packages neither the server nor its screen. The pipe is always pushed, so there is no
|
||||||
// Disaggregated CI explicitly selects all three switches.
|
// pipePush switch any more; disaggregated CI selects the two transport switches.
|
||||||
def mobileGlPipePush = {
|
|
||||||
(rootProject.findProperty('mobilegl.pipePush') ?: System.getenv('MOBILEGL_PIPE_PUSH_APK') ?: 'OFF') as String
|
|
||||||
}
|
|
||||||
def mobileGlBuildDisaggregated = {
|
def mobileGlBuildDisaggregated = {
|
||||||
(rootProject.findProperty('mobilegl.buildDisaggregated') ?: System.getenv('MOBILEGL_BUILD_DISAGGREGATED') ?: (standalonePluginBuild ? 'ON' : 'OFF')) as String
|
(rootProject.findProperty('mobilegl.buildDisaggregated') ?: System.getenv('MOBILEGL_BUILD_DISAGGREGATED') ?: (standalonePluginBuild ? 'ON' : 'OFF')) as String
|
||||||
}
|
}
|
||||||
@@ -76,7 +73,6 @@ android {
|
|||||||
cmake {
|
cmake {
|
||||||
arguments "-DMOBILEGL_LOG_ACTIVE_LEVEL=${mobileGlLogActiveLevel()}"
|
arguments "-DMOBILEGL_LOG_ACTIVE_LEVEL=${mobileGlLogActiveLevel()}"
|
||||||
arguments '-DCMAKE_EXPORT_COMPILE_COMMANDS=ON'
|
arguments '-DCMAKE_EXPORT_COMPILE_COMMANDS=ON'
|
||||||
arguments "-DMOBILEGL_PIPE_PUSH=${mobileGlPipePush()}"
|
|
||||||
arguments "-DMOBILEGL_BUILD_DISAGGREGATED=${mobileGlBuildDisaggregated()}"
|
arguments "-DMOBILEGL_BUILD_DISAGGREGATED=${mobileGlBuildDisaggregated()}"
|
||||||
arguments "-DMOBILEGL_BUILD_DISAGGREGATED_INPROC=${mobileGlBuildDisaggregatedInproc()}"
|
arguments "-DMOBILEGL_BUILD_DISAGGREGATED_INPROC=${mobileGlBuildDisaggregatedInproc()}"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user