summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-09-12 05:59:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-12 05:59:29 +0000
commitfed1594d707b4623015e538b2f69faf76bc38d5b (patch)
tree0a1e0cd89a11872e2900c094dde3d56814272b06 /media
parentbd014b81ef227752150bdbd1bb6a235db09f3616 (diff)
parent9916dcb6ef041752fda5f13192ee6a36e51e73a5 (diff)
downloadframeworks_av-fed1594d707b4623015e538b2f69faf76bc38d5b.zip
frameworks_av-fed1594d707b4623015e538b2f69faf76bc38d5b.tar.gz
frameworks_av-fed1594d707b4623015e538b2f69faf76bc38d5b.tar.bz2
am 9916dcb6: am 0d64fcb4: Merge "Clean up some makefiles."
* commit '9916dcb6ef041752fda5f13192ee6a36e51e73a5': Clean up some makefiles.
Diffstat (limited to 'media')
-rw-r--r--media/libeffects/loudness/Android.mk6
-rw-r--r--media/libeffects/proxy/Android.mk1
2 files changed, 1 insertions, 6 deletions
diff --git a/media/libeffects/loudness/Android.mk b/media/libeffects/loudness/Android.mk
index edf964e..70d7984 100644
--- a/media/libeffects/loudness/Android.mk
+++ b/media/libeffects/loudness/Android.mk
@@ -12,16 +12,12 @@ LOCAL_CFLAGS+= -O2 -fvisibility=hidden
LOCAL_SHARED_LIBRARIES := \
libcutils \
liblog \
- libstlport
LOCAL_MODULE_RELATIVE_PATH := soundfx
LOCAL_MODULE:= libldnhncr
LOCAL_C_INCLUDES := \
$(call include-path-for, audio-effects) \
- bionic \
- bionic/libstdc++/include \
- external/stlport/stlport
-
+include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY)
diff --git a/media/libeffects/proxy/Android.mk b/media/libeffects/proxy/Android.mk
index b438796..2ba452e 100644
--- a/media/libeffects/proxy/Android.mk
+++ b/media/libeffects/proxy/Android.mk
@@ -28,7 +28,6 @@ LOCAL_SHARED_LIBRARIES := liblog libcutils libutils libdl libeffects
LOCAL_C_INCLUDES := \
system/media/audio_effects/include \
- bionic/libc/include \
frameworks/av/media/libeffects/factory
include $(BUILD_SHARED_LIBRARY)