commit f8d57392afb71859bac1939d8be2d30ae2550bb4
author Cole Faust <colefaust@google.com> Wed Aug 07 17:56:53 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 07 17:56:53 2024 +0000
tree f2b9314720909ddb235743207963b908853745ba
parent 9985504eeeb3c14efc3641fe7e37aada3ab562d9
parent 3f721097ef425f2ec4a98de5fa9bae4711d2e1ae

Replace soong config module types with selects am: 617d4dd8bd am: 3f721097ef

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Profiling/+/3208611

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

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 8a7830b..625d324 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -27,26 +27,12 @@
     certificate: "com.android.profiling",
 }
 
-soong_config_module_type {
-    name: "custom_apex",
-    module_type: "apex",
-    config_namespace: "ANDROID",
-    bool_variables: [
-        "release_package_profiling_module",
-    ],
-    properties: [
-        "enabled",
-    ],
-}
-
-custom_apex {
+apex {
     // This apex will be enabled with release_package_profiling_module flag
-    enabled: false,
-    soong_config_variables: {
-        release_package_profiling_module: {
-            enabled: true,
-        },
-    },
+    enabled: select(release_flag("RELEASE_PACKAGE_PROFILING_MODULE"), {
+        true: true,
+        false: false,
+    }),
 
     name: "com.android.profiling",
     manifest: "manifest.json",
@@ -60,52 +46,24 @@
     systemserverclasspath_fragments: ["com.android.profiling-systemserverclasspath-fragment"],
 }
 
-soong_config_module_type {
-    name: "custom_systemserverclasspath_fragment",
-    module_type: "systemserverclasspath_fragment",
-    config_namespace: "ANDROID",
-    bool_variables: [
-        "release_package_profiling_module",
-    ],
-    properties: [
-        "enabled",
-    ],
-}
-
-custom_systemserverclasspath_fragment {
+systemserverclasspath_fragment {
     // This fragment will be enabled with release_package_profiling_module flag
-    enabled: false,
-    soong_config_variables: {
-        release_package_profiling_module: {
-            enabled: true,
-        },
-    },
+    enabled: select(release_flag("RELEASE_PACKAGE_PROFILING_MODULE"), {
+        true: true,
+        false: false,
+    }),
 
     name: "com.android.profiling-systemserverclasspath-fragment",
     standalone_contents: ["service-profiling"],
     apex_available: ["com.android.profiling"],
 }
 
-soong_config_module_type {
-    name: "custom_bootclasspath_fragment",
-    module_type: "bootclasspath_fragment",
-    config_namespace: "ANDROID",
-    bool_variables: [
-        "release_package_profiling_module",
-    ],
-    properties: [
-        "enabled",
-    ],
-}
-
-custom_bootclasspath_fragment {
+bootclasspath_fragment {
     // This fragment will be enabled with release_package_profiling_module flag
-    enabled: false,
-    soong_config_variables: {
-        release_package_profiling_module: {
-            enabled: true,
-        },
-    },
+    enabled: select(release_flag("RELEASE_PACKAGE_PROFILING_MODULE"), {
+        true: true,
+        false: false,
+    }),
 
     name: "com.android.profiling-bootclasspath-fragment",
     contents: ["framework-profiling"],