commit 07be14fb96fc5c106ea2b874faf2b768f468eb8e
author Kevin Rocard <krocard@google.com> Wed Jan 24 06:14:03 2018 +0000
committer Kevin Rocard <krocard@google.com> Wed Jan 24 06:14:03 2018 +0000
tree 01cd8f75542d7581505bef8a5b9e2f09790ac0e1
parent f8ad7f85e9891b2614338330c75ae9e946fccc5a

Revert "Audio V4: Split system and vendor Audio.h"

This reverts commit f8ad7f85e9891b2614338330c75ae9e946fccc5a.

Reason for revert: Breaks the build of multiple devices

Change-Id: I24f17a0fa0c7ba171c4a3639f890e7f4e42f6b1e

media/libeffects/lvm/wrapper/Android.mk

diff --git a/media/libeffects/lvm/wrapper/Android.mk b/media/libeffects/lvm/wrapper/Android.mk
index 4673f6c..341dbc2 100644
--- a/media/libeffects/lvm/wrapper/Android.mk
+++ b/media/libeffects/lvm/wrapper/Android.mk
@@ -35,10 +35,7 @@
 	$(call include-path-for, audio-effects) \
 	$(call include-path-for, audio-utils) \
 
-LOCAL_HEADER_LIBRARIES += \
-    libhardware_headers \
-    android.hardware.audio.effect.legacy@2.0 \
-
+LOCAL_HEADER_LIBRARIES += libhardware_headers
 include $(BUILD_SHARED_LIBRARY)
 
 
@@ -70,11 +67,10 @@
     $(LOCAL_PATH)/Reverb \
     $(LOCAL_PATH)/../lib/Common/lib/ \
     $(LOCAL_PATH)/../lib/Reverb/lib/ \
+    $(call include-path-for, audio-effects) \
     $(call include-path-for, audio-utils) \
 
-LOCAL_HEADER_LIBRARIES += \
-    libhardware_headers \
-    android.hardware.audio.effect.legacy@2.0 \
+LOCAL_HEADER_LIBRARIES += libhardware_headers
 
 LOCAL_SANITIZE := integer_overflow