summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNate Myren <ntmyren@google.com>2024-04-19 19:07:46 +0000
committerNate Myren <ntmyren@google.com>2024-04-19 19:13:05 +0000
commit229c235eaeacac862ea6d9e86620ddaa2965298e (patch)
tree57279fbdec8dc8c8e15c544214fa636ae90e5e07
parent77a2325b5ae770507683d3ec690b8dc40f54f802 (diff)
downloadrelease-229c235eaeacac862ea6d9e86620ddaa2965298e.tar.gz
Add and enable flag for writing appcomppat system properties
Currently, init always writes a copy of system properties to /dev/__properties__/appcompat_override. This behavior is now conditional on this flag. This flag is being enabled to keep current behavior the same. Bug: 331307495 Test: manual (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:eace1752a33f6de99375b374756617b96a3013c7) Merged-In: I0807597f26b31aab416aa3a0a19918e9d6869695 Change-Id: I0807597f26b31aab416aa3a0a19918e9d6869695
-rw-r--r--build_config/trunk.scl1
-rw-r--r--build_config/trunk_staging.scl1
-rw-r--r--build_flags.scl3
3 files changed, 5 insertions, 0 deletions
diff --git a/build_config/trunk.scl b/build_config/trunk.scl
index 1768f4e..03832db 100644
--- a/build_config/trunk.scl
+++ b/build_config/trunk.scl
@@ -57,6 +57,7 @@ values = [
value("RELEASE_PLATFORM_VERSION_LAST_STABLE", "14"),
value("RELEASE_PLATFORM_VNDK_VERSION", "35"),
value("RELEASE_REMOVE_LEGACY_EMOJI_FONT", True),
+ value("RELEASE_WRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES", True),
# keep-sorted end
]
# Flags should be alphabetical by flag name to reduce merge conflifcts
diff --git a/build_config/trunk_staging.scl b/build_config/trunk_staging.scl
index 9cab9f1..907b84b 100644
--- a/build_config/trunk_staging.scl
+++ b/build_config/trunk_staging.scl
@@ -58,6 +58,7 @@ values = [
value("RELEASE_PLATFORM_VNDK_VERSION", "35"),
value("RELEASE_SELINUX_DATA_DATA_IGNORE", True),
value("RELEASE_UNLOCKED_STORAGE_API", True),
+ value("RELEASE_WRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES", True),
# keep-sorted end
]
# Flags should be alphabetical by flag name to reduce merge conflifcts
diff --git a/build_flags.scl b/build_flags.scl
index 492a0fd..8224d0f 100644
--- a/build_flags.scl
+++ b/build_flags.scl
@@ -226,5 +226,8 @@ flags = [
# b/318717084 - enable the WebViewBootstrap mainline module
flag("RELEASE_USE_WEBVIEW_BOOTSTRAP_MODULE", ALL, False),
+
+ # flag to enable the writing of appcompat override system properties
+ flag("RELEASE_WRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES", ALL, False, origin="aosp"),
]
# Flags should be alphabetical by flag name to reduce merge conflifcts