commit e99fd37acd136dcd41a7eafe4e6ce7aecf766c4c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Aug 19 21:12:31 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Aug 19 21:12:31 2024 +0000
tree ae0558b8d6a009776b5874643acc8bd01101b823
parent 2eed49fa65d5071fe0e29638ab6ca9ffde1846fe
parent 83bbbf659e616a60a7bf91c12fff50eb14ea3e45

Merge "Replace soong config module types with selects" into main am: 83bbbf659e

Original change: https://android-review.googlesource.com/c/platform/bionic/+/3228805

Change-Id: I9f3ccac6c79b7d1eccaa095b90f8b3a0fe9db0d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libc/system_properties/Android.bp

diff --git a/libc/system_properties/Android.bp b/libc/system_properties/Android.bp
index 16ea73f..e2fce34 100644
--- a/libc/system_properties/Android.bp
+++ b/libc/system_properties/Android.bp
@@ -58,27 +58,10 @@
     ],
 }
 
-soong_config_module_type {
-    name: "large_system_property_node_cc_defaults",
-    module_type: "cc_defaults",
-    config_namespace: "bionic",
-    bool_variables: [
-        "large_system_property_node",
-    ],
-    properties: [
-        "cflags",
-    ],
-}
-
-soong_config_bool_variable {
-    name: "large_system_property_node",
-}
-
-large_system_property_node_cc_defaults {
+cc_defaults {
     name: "large_system_property_node_defaults",
-    soong_config_variables: {
-        large_system_property_node: {
-            cflags: ["-DLARGE_SYSTEM_PROPERTY_NODE=1"]
-        }
-    }
+    cflags: select(release_flag("RELEASE_LARGE_SYSTEM_PROPERTY_NODE"), {
+        true: ["-DLARGE_SYSTEM_PROPERTY_NODE=1"],
+        default: [],
+    }),
 }