diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-25 15:04:05 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-11-25 15:04:05 -0800 |
| commit | 5c0409ea0798868d450cc3c32b411b5adbbf9c67 (patch) | |
| tree | a173a5cabb22d0547922ef7dc5d071940a0ccfce /media/libstagefright/filters | |
| parent | e1d38aa7bb9a8c6da4ceb479303599cd54b03235 (diff) | |
| download | frameworks_av-5c0409ea0798868d450cc3c32b411b5adbbf9c67.zip frameworks_av-5c0409ea0798868d450cc3c32b411b5adbbf9c67.tar.gz frameworks_av-5c0409ea0798868d450cc3c32b411b5adbbf9c67.tar.bz2 | |
Fix build from broken makefile.
LOCAL_NDK_STL_VARIANT is a no-op if LOCAL_SDK_VERSION is not set, and
this project cannot actually be built with the NDK (it uses platform
only libraries like cutils).
There's no reason (I hope) to be using stlport in the library anyway,
so just let them use all of libc++.
Change-Id: Ia917dbaf347cc438990386d21d95b8b73cd34614
Diffstat (limited to 'media/libstagefright/filters')
| -rw-r--r-- | media/libstagefright/filters/Android.mk | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/media/libstagefright/filters/Android.mk b/media/libstagefright/filters/Android.mk index 5e895e1..36ab444 100644 --- a/media/libstagefright/filters/Android.mk +++ b/media/libstagefright/filters/Android.mk @@ -1,8 +1,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_NDK_STL_VARIANT := stlport_static - LOCAL_SRC_FILES := \ ColorConvert.cpp \ GraphicBufferListener.cpp \ @@ -15,9 +13,6 @@ LOCAL_SRC_FILES := \ ZeroFilter.cpp LOCAL_C_INCLUDES := \ - $(TOP)/bionic \ - $(TOP)/bionic/libstdc++/include \ - $(TOP)/external/stlport/stlport \ $(TOP)/frameworks/native/include/media/openmax \ $(TOP)/frameworks/rs/cpp \ $(TOP)/frameworks/rs \ |