Merge changes from topic 'vendor_available_libeffects'
* changes:
Change libeffect from vendor:true to vendor_available:true
Add libeffects_headers.
libeffects: move to vendor
diff --git a/CleanSpec.mk b/CleanSpec.mk
index c8e3c09..bbb0028 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -69,6 +69,8 @@
$(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)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libaudiopreprocessing.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libeffects.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/libeffects.so)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/include/media/EffectsFactoryApi.h b/include/media/EffectsFactoryApi.h
new file mode 120000
index 0000000..288590a
--- /dev/null
+++ b/include/media/EffectsFactoryApi.h
@@ -0,0 +1 @@
+../../media/libeffects/factory/include/media/EffectsFactoryApi.h
\ No newline at end of file
diff --git a/media/libeffects/factory/Android.bp b/media/libeffects/factory/Android.bp
index 0d8b6eb..01554c2 100644
--- a/media/libeffects/factory/Android.bp
+++ b/media/libeffects/factory/Android.bp
@@ -1,6 +1,15 @@
+cc_library_headers {
+ name: "libeffects_headers",
+ vendor_available: true,
+ export_include_dirs: ["include"],
+ header_libs: ["libhardware_headers"],
+ export_header_lib_headers: ["libhardware_headers"],
+}
+
// Effect factory library
cc_library_shared {
name: "libeffects",
+ vendor_available: true,
srcs: ["EffectsFactory.c"],
shared_libs: [
@@ -10,4 +19,9 @@
],
include_dirs: ["system/media/audio_effects/include"],
+
+ local_include_dirs:["include/media"],
+
+ header_libs: ["libeffects_headers"],
+ export_header_lib_headers: ["libeffects_headers"],
}
diff --git a/include/media/EffectsFactoryApi.h b/media/libeffects/factory/include/media/EffectsFactoryApi.h
similarity index 100%
rename from include/media/EffectsFactoryApi.h
rename to media/libeffects/factory/include/media/EffectsFactoryApi.h