Merge "Convert libmedia to Android.bp"
diff --git a/CleanSpec.mk b/CleanSpec.mk
index d0890fe..f860c93 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -59,6 +59,15 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libaudiopolicymanager.so)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libaudiopolicyservice_intermediates)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libaudiopolicymanager_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libeffects.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/libeffects.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libeffects_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libeffectproxy.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libldnhncr.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libdownmix.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libvisualizer.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libreverbwrapper.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libbundlewrapper.so)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/media/libeffects/downmix/Android.mk b/media/libeffects/downmix/Android.mk
index e0ca8af..c5ae5f8 100644
--- a/media/libeffects/downmix/Android.mk
+++ b/media/libeffects/downmix/Android.mk
@@ -3,6 +3,7 @@
# Multichannel downmix effect library
include $(CLEAR_VARS)
+LOCAL_VENDOR_MODULE := true
LOCAL_SRC_FILES:= \
EffectDownmix.c
diff --git a/media/libeffects/loudness/Android.mk b/media/libeffects/loudness/Android.mk
index 55d0611..5b9eab5 100644
--- a/media/libeffects/loudness/Android.mk
+++ b/media/libeffects/loudness/Android.mk
@@ -3,6 +3,7 @@
# LoudnessEnhancer library
include $(CLEAR_VARS)
+LOCAL_VENDOR_MODULE := true
LOCAL_SRC_FILES:= \
EffectLoudnessEnhancer.cpp \
dsp/core/dynamic_range_compression.cpp
diff --git a/media/libeffects/lvm/lib/Android.mk b/media/libeffects/lvm/lib/Android.mk
index bb56c75..85e01e0 100644
--- a/media/libeffects/lvm/lib/Android.mk
+++ b/media/libeffects/lvm/lib/Android.mk
@@ -6,6 +6,7 @@
LOCAL_ARM_MODE := arm
+LOCAL_VENDOR_MODULE := true
LOCAL_SRC_FILES:= \
StereoWidening/src/LVCS_BypassMix.c \
StereoWidening/src/LVCS_Control.c \
@@ -130,6 +131,7 @@
LOCAL_ARM_MODE := arm
+LOCAL_VENDOR_MODULE := true
LOCAL_SRC_FILES:= \
Reverb/src/LVREV_ApplyNewSettings.c \
Reverb/src/LVREV_ClearAudioBuffers.c \
diff --git a/media/libeffects/lvm/wrapper/Android.mk b/media/libeffects/lvm/wrapper/Android.mk
index 4e38e3d..f2c6fd9 100644
--- a/media/libeffects/lvm/wrapper/Android.mk
+++ b/media/libeffects/lvm/wrapper/Android.mk
@@ -6,6 +6,7 @@
LOCAL_ARM_MODE := arm
+LOCAL_VENDOR_MODULE := true
LOCAL_SRC_FILES:= \
Bundle/EffectBundle.cpp
@@ -36,6 +37,7 @@
LOCAL_ARM_MODE := arm
+LOCAL_VENDOR_MODULE := true
LOCAL_SRC_FILES:= \
Reverb/EffectReverb.cpp
diff --git a/media/libeffects/proxy/Android.mk b/media/libeffects/proxy/Android.mk
index 2ba452e..eeba73f 100644
--- a/media/libeffects/proxy/Android.mk
+++ b/media/libeffects/proxy/Android.mk
@@ -18,7 +18,7 @@
LOCAL_MODULE_RELATIVE_PATH := soundfx
LOCAL_MODULE_TAGS := optional
-
+LOCAL_VENDOR_MODULE := true
LOCAL_SRC_FILES := \
EffectProxy.cpp
diff --git a/media/libeffects/visualizer/Android.mk b/media/libeffects/visualizer/Android.mk
index c92c543..aac90a6 100644
--- a/media/libeffects/visualizer/Android.mk
+++ b/media/libeffects/visualizer/Android.mk
@@ -3,6 +3,7 @@
# Visualizer library
include $(CLEAR_VARS)
+LOCAL_VENDOR_MODULE := true
LOCAL_SRC_FILES:= \
EffectVisualizer.cpp
