summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Wei Huang <cwhuang@linux.org.tw>2014-11-06 12:12:27 +0800
committerChih-Wei Huang <cwhuang@linux.org.tw>2014-11-06 12:23:46 +0800
commitf1d06d6a40b8c33b36cc8d389c43ff8a0048ae71 (patch)
tree2e0c679891a4c13d41f837e001ff7304a329b853
parent293bd2c92f145997f04048bbc0b15f6b9f742534 (diff)
downloadplatform_hardware_libaudio-f1d06d6a40b8c33b36cc8d389c43ff8a0048ae71.tar.gz
platform_hardware_libaudio-f1d06d6a40b8c33b36cc8d389c43ff8a0048ae71.tar.bz2
platform_hardware_libaudio-f1d06d6a40b8c33b36cc8d389c43ff8a0048ae71.zip
enable multiarch builds
Convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH to support 64-bit targets. Also add audio.r_submix.default.
-rw-r--r--Android.mk4
-rw-r--r--alsa.mk1
2 files changed, 3 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index a280f6c..ae9c174 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2013 The Android-x86 Open Source Project
+# Copyright (C) 2011-2014 The Android-x86 Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := audio.primary.x86
LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SHARED_LIBRARIES := \
liblog \
libcutils \
diff --git a/alsa.mk b/alsa.mk
index ac7cd60..6b5c036 100644
--- a/alsa.mk
+++ b/alsa.mk
@@ -53,3 +53,4 @@ PRODUCT_PACKAGES := \
audio.a2dp.default \
audio.usb.default \
audio_policy.default \
+ audio.r_submix.default \