Replace platform_version_use_sound_trigger_hal with sound_trigger_hal_is_android_p am: 2434cf8de6 am: e11e7edb62 am: 65c1bdbb3b am: 61ca38058a

Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/2030924

Change-Id: If6bb6ddadaacc4b68006c673789f937e826949ff

1 files changed, 6 insertions, 13 deletions

diff --git a/Android.bp b/Android.bp
index 30c2b42..c9e764b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,11 +25,8 @@ soong_config_string_variable {
     ],
 }
 
-soong_config_string_variable {
-    name: "platform_version_use_sound_trigger_hal",
-    values: [
-        "P",
-    ],
+soong_config_bool_variable {
+    name: "sound_trigger_hal_is_android_p",
 }
 
 soong_config_module_type {
@@ -38,7 +35,7 @@ soong_config_module_type {
     config_namespace: "knowles",
     variables: [
         "use_sound_trigger_hal",
-        "platform_version_use_sound_trigger_hal",
+        "sound_trigger_hal_is_android_p",
     ],
     properties: [
         "enabled",
@@ -59,13 +56,9 @@ use_sound_trigger_hal_cc_defaults {
                 enabled: false,
             }
         },
-        platform_version_use_sound_trigger_hal: {
-            p: {
-                proprietary: true,
-                cflags: ["-DANDROID_P"],
-            },
-            conditions_default: {
-            },
+        sound_trigger_hal_is_android_p: {
+            proprietary: true,
+            cflags: ["-DANDROID_P"],
         }
     },
 }