commit 9d618554167f35a81f96db5dd4b22a64561e004d
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Sep 27 18:42:20 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 27 18:42:20 2024 +0000
tree 45574a4bea6c28d737da11a772b4ff08ec999b0b
parent cc0bb805aa7fdc3c0208858fcdfb21686773fef7
parent 097ca8881c88822ed1aa7e919e3ec2edb9dea379

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

tools/aconfig/aconfig_storage_read_api/Android.bp

diff --git a/tools/aconfig/aconfig_storage_read_api/Android.bp b/tools/aconfig/aconfig_storage_read_api/Android.bp
index f96b223..6ae34f3 100644
--- a/tools/aconfig/aconfig_storage_read_api/Android.bp
+++ b/tools/aconfig/aconfig_storage_read_api/Android.bp
@@ -107,31 +107,12 @@
     afdo: true,
 }
 
-soong_config_module_type {
-    name: "aconfig_lib_cc_shared_link_defaults",
-    module_type: "cc_defaults",
-    config_namespace: "Aconfig",
-    bool_variables: [
-        "read_from_new_storage",
-    ],
-    properties: [
-        "shared_libs",
-    ],
-}
-
-soong_config_bool_variable {
-    name: "read_from_new_storage",
-}
-
-aconfig_lib_cc_shared_link_defaults {
+cc_defaults {
     name: "aconfig_lib_cc_shared_link.defaults",
-    soong_config_variables: {
-        read_from_new_storage: {
-            shared_libs: [
-                "libaconfig_storage_read_api_cc",
-            ],
-        },
-    },
+    shared_libs: select(release_flag("RELEASE_READ_FROM_NEW_STORAGE"), {
+        true: ["libaconfig_storage_read_api_cc"],
+        default: [],
+    }),
 }
 
 cc_defaults {