diff options
| author | Misael Lopez Cruz <misael.lopez@ti.com> | 2017-09-12 23:14:59 -0500 |
|---|---|---|
| committer | Vishal Mahaveer <vishalm@ti.com> | 2017-09-13 16:15:03 -0500 |
| commit | 81c8c445be3a0d7b1c0e6da61b5e3230fcb52d71 (patch) | |
| tree | 9c22954e6394cd713a23280b6af9276efecd8463 | |
| parent | 412b2b3bc900ca08670de7a39140bdc6d8f3ce58 (diff) | |
| download | jacinto6evm-81c8c445be3a0d7b1c0e6da61b5e3230fcb52d71.tar.gz | |
audio: Move HALs and policy files to vendor partition
Move the audio policy configuration file and the J6 audio HALs
(primary, JAMR3 and HDMI) to the 'vendor' partition.
Change-Id: I0753cc7ef67425921acaa2f4a7c8c1b4a087d679
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
| -rw-r--r-- | audio/hdmi/Android.mk | 2 | ||||
| -rw-r--r-- | audio/jamr3/Android.mk | 2 | ||||
| -rw-r--r-- | audio/jamr3/jamr3_audio_hw.c | 2 | ||||
| -rw-r--r-- | audio/primary/Android.mk | 2 | ||||
| -rw-r--r-- | audio/primary/audio_hw.c | 4 | ||||
| -rw-r--r-- | device.mk | 8 |
6 files changed, 11 insertions, 9 deletions
diff --git a/audio/hdmi/Android.mk b/audio/hdmi/Android.mk index 44d4589..7c03808 100644 --- a/audio/hdmi/Android.mk +++ b/audio/hdmi/Android.mk @@ -20,7 +20,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := audio.hdmi.$(TARGET_BOARD_PLATFORM) -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/hw LOCAL_SRC_FILES := hdmi_audio_hw.c \ hdmi_audio_utils.c diff --git a/audio/jamr3/Android.mk b/audio/jamr3/Android.mk index 16c3222..277745c 100644 --- a/audio/jamr3/Android.mk +++ b/audio/jamr3/Android.mk @@ -20,7 +20,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := audio.jamr3.$(TARGET_BOARD_PLATFORM) -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/hw LOCAL_SRC_FILES := jamr3_audio_hw.c LOCAL_C_INCLUDES += \ diff --git a/audio/jamr3/jamr3_audio_hw.c b/audio/jamr3/jamr3_audio_hw.c index 7dd8c2c..c7b5258 100644 --- a/audio/jamr3/jamr3_audio_hw.c +++ b/audio/jamr3/jamr3_audio_hw.c @@ -107,7 +107,7 @@ static const char *supported_cards[] = { #define CAPTURE_PERIOD_COUNT 4 #define CAPTURE_BUFFER_SIZE (CAPTURE_PERIOD_SIZE * CAPTURE_PERIOD_COUNT) -#define MIXER_XML_PATH "/system/etc/jamr3_mixer_paths.xml" +#define MIXER_XML_PATH "/vendor/etc/jamr3_mixer_paths.xml" struct pcm_config pcm_config_capture = { .channels = 2, diff --git a/audio/primary/Android.mk b/audio/primary/Android.mk index 98f0598..9cb0f0c 100644 --- a/audio/primary/Android.mk +++ b/audio/primary/Android.mk @@ -20,7 +20,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := audio.primary.$(TARGET_BOARD_PLATFORM) -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/hw LOCAL_SRC_FILES := audio_hw.c LOCAL_C_INCLUDES += \ diff --git a/audio/primary/audio_hw.c b/audio/primary/audio_hw.c index 6e09047..0ae1f54 100644 --- a/audio/primary/audio_hw.c +++ b/audio/primary/audio_hw.c @@ -172,6 +172,8 @@ static const char *supported_bt_cards[] = { #define BT_PERIOD_COUNT 4 #define BT_BUFFER_SIZE (BT_PERIOD_SIZE * BT_PERIOD_COUNT) +#define MIXER_XML_PATH "/vendor/etc/mixer_paths.xml" + struct pcm_config pcm_config_capture = { .channels = 2, .rate = CAPTURE_SAMPLE_RATE, @@ -1780,7 +1782,7 @@ static int adev_open(const hw_module_t* module, const char* name, adev->in_call = false; adev->mode = AUDIO_MODE_NORMAL; - adev->route = audio_route_init(adev->card, NULL); + adev->route = audio_route_init(adev->card, MIXER_XML_PATH); if (!adev->route) { ALOGE("Unable to initialize audio routes"); free(adev); @@ -70,15 +70,15 @@ PRODUCT_COPY_FILES += \ # Audio ifeq ($(APPE_AUDIO),true) PRODUCT_COPY_FILES += \ - hardware/ti/radio/vis_sdk/packages/android/hal/mixer_paths.xml:system/etc/mixer_paths.xml + hardware/ti/radio/vis_sdk/packages/android/hal/mixer_paths.xml:vendor/etc/mixer_paths.xml else PRODUCT_COPY_FILES += \ - device/ti/jacinto6evm/audio/primary/mixer_paths.xml:system/etc/mixer_paths.xml \ - device/ti/jacinto6evm/audio/jamr3/jamr3_mixer_paths.xml:system/etc/jamr3_mixer_paths.xml + device/ti/jacinto6evm/audio/primary/mixer_paths.xml:vendor/etc/mixer_paths.xml \ + device/ti/jacinto6evm/audio/jamr3/jamr3_mixer_paths.xml:vendor/etc/jamr3_mixer_paths.xml endif PRODUCT_COPY_FILES += \ - device/ti/jacinto6evm/audio/audio_policy.conf:system/etc/audio_policy.conf + device/ti/jacinto6evm/audio/audio_policy.conf:vendor/etc/audio_policy.conf # cpuset configuration PRODUCT_COPY_FILES += \ |