diff options
author | Cole Faust <colefaust@google.com> | 2022-03-17 12:16:27 -0700 |
---|---|---|
committer | Cole Faust <colefaust@google.com> | 2022-03-17 12:27:11 -0700 |
commit | 2434cf8de643de0bf791ee79e4e7e90a1bc250ab (patch) | |
tree | a44491a957392969ca4722c3b95c980dc0569295 | |
parent | a793b8970c77aa21a560474e51556a271932276b (diff) | |
download | sound_trigger_hal-2434cf8de643de0bf791ee79e4e7e90a1bc250ab.tar.gz |
Replace platform_version_use_sound_trigger_hal with sound_trigger_hal_is_android_p
This is to facilitate making it a requirement for
soong_config_string_variables to only be set to one of
their possible values.
Bug: 220375749
Test: Presubmits
Change-Id: I3f718054f842dd196368ea4a03dc76157a21fa2d
-rw-r--r-- | Android.bp | 19 |
1 files changed, 6 insertions, 13 deletions
@@ -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"], } }, } |