[Audio AIDL] Move audiometricext to HIDL only.
Previously, audiometricext module which is HIDL module is mistakenly included in AIDL rom. Test: Local Build on both HIDL and AIDL devices Flag: EXEMPT bugfix Bug: 369772495 Change-Id: Ic56fa134056afa782440a8f1dcaa032df481bcc2
This commit is contained in:
parent
e943d565fe
commit
afd55f92b9
6 changed files with 19 additions and 24 deletions
|
@ -4,12 +4,6 @@ PRODUCT_PACKAGES += dump_aoc \
|
||||||
aocd \
|
aocd \
|
||||||
aocxd
|
aocxd
|
||||||
|
|
||||||
ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
|
|
||||||
# IAudioMetricExt HIDL
|
|
||||||
PRODUCT_PACKAGES += \
|
|
||||||
vendor.google.audiometricext@1.0-service-vendor
|
|
||||||
endif
|
|
||||||
|
|
||||||
# If AoC Daemon is not present on this build, load firmware at boot via rc
|
# If AoC Daemon is not present on this build, load firmware at boot via rc
|
||||||
ifeq ($(wildcard vendor/google/whitechapel/aoc/aocd),)
|
ifeq ($(wildcard vendor/google/whitechapel/aoc/aocd),)
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
|
|
|
@ -1,12 +1,4 @@
|
||||||
<compatibility-matrix version="1.0" type="framework">
|
<compatibility-matrix version="1.0" type="framework">
|
||||||
<hal format="hidl">
|
|
||||||
<name>vendor.google.audiometricext</name>
|
|
||||||
<version>1.0</version>
|
|
||||||
<interface>
|
|
||||||
<name>IAudioMetricExt</name>
|
|
||||||
<instance>default</instance>
|
|
||||||
</interface>
|
|
||||||
</hal>
|
|
||||||
<hal format="aidl">
|
<hal format="aidl">
|
||||||
<name>vendor.google.whitechapel.audio.extension</name>
|
<name>vendor.google.whitechapel.audio.extension</name>
|
||||||
<version>3</version>
|
<version>3</version>
|
||||||
|
|
|
@ -1,11 +1,2 @@
|
||||||
<manifest version="1.0" type="device">
|
<manifest version="1.0" type="device">
|
||||||
<hal format="hidl">
|
|
||||||
<name>vendor.google.audiometricext</name>
|
|
||||||
<transport>hwbinder</transport>
|
|
||||||
<version>1.0</version>
|
|
||||||
<interface>
|
|
||||||
<name>IAudioMetricExt</name>
|
|
||||||
<instance>default</instance>
|
|
||||||
</interface>
|
|
||||||
</hal>
|
|
||||||
</manifest>
|
</manifest>
|
||||||
|
|
|
@ -32,8 +32,14 @@ PRODUCT_PACKAGES += \
|
||||||
libamcsextfile \
|
libamcsextfile \
|
||||||
audio_amcs_ext \
|
audio_amcs_ext \
|
||||||
|
|
||||||
|
ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
|
||||||
|
# IAudioMetricExt HIDL
|
||||||
|
PRODUCT_PACKAGES += \
|
||||||
|
vendor.google.audiometricext@1.0-service-vendor
|
||||||
|
endif
|
||||||
|
|
||||||
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/hidl
|
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/hidl
|
||||||
|
|
||||||
include device/google/gs-common/audio/common.mk
|
include device/google/gs-common/audio/common.mk
|
||||||
|
|
||||||
DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/audio/hidl/device_framework_matrix_product_gs101.xml
|
DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/audio/hidl/device_framework_matrix_product_gs101.xml
|
|
@ -32,6 +32,12 @@ PRODUCT_PACKAGES += \
|
||||||
audio_spk_35l41 \
|
audio_spk_35l41 \
|
||||||
sound_trigger.primary.$(TARGET_BOARD_PLATFORM)
|
sound_trigger.primary.$(TARGET_BOARD_PLATFORM)
|
||||||
|
|
||||||
|
ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
|
||||||
|
# IAudioMetricExt HIDL
|
||||||
|
PRODUCT_PACKAGES += \
|
||||||
|
vendor.google.audiometricext@1.0-service-vendor
|
||||||
|
endif
|
||||||
|
|
||||||
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/hidl
|
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/hidl
|
||||||
|
|
||||||
include device/google/gs-common/audio/common.mk
|
include device/google/gs-common/audio/common.mk
|
||||||
|
|
|
@ -35,6 +35,12 @@ PRODUCT_PACKAGES += \
|
||||||
audio_hdmi_aoc \
|
audio_hdmi_aoc \
|
||||||
sound_trigger.primary.$(TARGET_BOARD_PLATFORM)
|
sound_trigger.primary.$(TARGET_BOARD_PLATFORM)
|
||||||
|
|
||||||
|
ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
|
||||||
|
# IAudioMetricExt HIDL
|
||||||
|
PRODUCT_PACKAGES += \
|
||||||
|
vendor.google.audiometricext@1.0-service-vendor
|
||||||
|
endif
|
||||||
|
|
||||||
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/hidl
|
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/hidl
|
||||||
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/hdmi_audio
|
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/hdmi_audio
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue