commit 83bbbf659e616a60a7bf91c12fff50eb14ea3e45
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Aug 19 21:07:20 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 19 21:07:20 2024 +0000
tree c8efcc968bc63fbcb000ec18bb43c4bf8be07e5c
parent e0f05a4f813b1f527f7f1e6d8401c168cbf14d77
parent 8c982629b6f17fc5851fba81ba00de2243ae32dc

Merge "Replace soong config module types with selects" into main

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: [],
+    }),
 }