diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-12 19:27:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-12 19:27:43 +0000 |
| commit | b55e1228f24dd707e120572e83bbdf1b691cd4b7 (patch) | |
| tree | 7c122febc7adfa578cdc445a093c71d09ffdb64a /media/libeffects | |
| parent | 2734bb9e5dbbacaf636644cbf12068b7e5aa09b8 (diff) | |
| parent | fed1594d707b4623015e538b2f69faf76bc38d5b (diff) | |
| download | frameworks_av-b55e1228f24dd707e120572e83bbdf1b691cd4b7.zip frameworks_av-b55e1228f24dd707e120572e83bbdf1b691cd4b7.tar.gz frameworks_av-b55e1228f24dd707e120572e83bbdf1b691cd4b7.tar.bz2 | |
am fed1594d: am 9916dcb6: am 0d64fcb4: Merge "Clean up some makefiles."
* commit 'fed1594d707b4623015e538b2f69faf76bc38d5b':
Clean up some makefiles.
Diffstat (limited to 'media/libeffects')
| -rw-r--r-- | media/libeffects/loudness/Android.mk | 6 | ||||
| -rw-r--r-- | media/libeffects/proxy/Android.mk | 1 |
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) |