diff options
| author | Andreas Huber <andih@google.com> | 2014-02-12 00:21:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-12 00:21:27 +0000 |
| commit | 90bdb98b8f8730074fcead63c33e8c3ce458b632 (patch) | |
| tree | e854851138f86d8d42d1949ab48b14799b135ce0 /media/libstagefright | |
| parent | ccb067b1d8424ba610cbd3de83368bd55b532b5b (diff) | |
| parent | def582e93022fa5eb7a64d4a11c15598afc0db86 (diff) | |
| download | frameworks_av-90bdb98b8f8730074fcead63c33e8c3ce458b632.zip frameworks_av-90bdb98b8f8730074fcead63c33e8c3ce458b632.tar.gz frameworks_av-90bdb98b8f8730074fcead63c33e8c3ce458b632.tar.bz2 | |
Merge "fix the OS X builds until we can fix compiler warnings that apparently"
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/Android.mk | 2 | ||||
| -rw-r--r-- | media/libstagefright/codecs/on2/enc/Android.mk | 2 | ||||
| -rw-r--r-- | media/libstagefright/colorconversion/Android.mk | 2 | ||||
| -rw-r--r-- | media/libstagefright/omx/Android.mk | 2 | ||||
| -rw-r--r-- | media/libstagefright/wifi-display/Android.mk | 2 |
5 files changed, 1 insertions, 9 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 1495df0..f94f136 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -112,7 +112,7 @@ LOCAL_SHARED_LIBRARIES += \ libstagefright_foundation \ libdl -LOCAL_CFLAGS += -Wno-multichar -Werror +LOCAL_CFLAGS += -Wno-multichar LOCAL_MODULE:= libstagefright diff --git a/media/libstagefright/codecs/on2/enc/Android.mk b/media/libstagefright/codecs/on2/enc/Android.mk index cbb1a89..4060a0a 100644 --- a/media/libstagefright/codecs/on2/enc/Android.mk +++ b/media/libstagefright/codecs/on2/enc/Android.mk @@ -26,6 +26,4 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE := libstagefright_soft_vpxenc LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS += -Werror - include $(BUILD_SHARED_LIBRARY) diff --git a/media/libstagefright/colorconversion/Android.mk b/media/libstagefright/colorconversion/Android.mk index 1c90957..59a64ba 100644 --- a/media/libstagefright/colorconversion/Android.mk +++ b/media/libstagefright/colorconversion/Android.mk @@ -11,6 +11,4 @@ LOCAL_C_INCLUDES := \ LOCAL_MODULE:= libstagefright_color_conversion -LOCAL_CFLAGS += -Werror - include $(BUILD_STATIC_LIBRARY) diff --git a/media/libstagefright/omx/Android.mk b/media/libstagefright/omx/Android.mk index 37b289f..cd912e7 100644 --- a/media/libstagefright/omx/Android.mk +++ b/media/libstagefright/omx/Android.mk @@ -16,8 +16,6 @@ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/native/include/media/hardware \ $(TOP)/frameworks/native/include/media/openmax -LOCAL_CFLAGS += -Werror - LOCAL_SHARED_LIBRARIES := \ libbinder \ libmedia \ diff --git a/media/libstagefright/wifi-display/Android.mk b/media/libstagefright/wifi-display/Android.mk index 3f47bfb..f70454a 100644 --- a/media/libstagefright/wifi-display/Android.mk +++ b/media/libstagefright/wifi-display/Android.mk @@ -19,8 +19,6 @@ LOCAL_C_INCLUDES:= \ $(TOP)/frameworks/native/include/media/openmax \ $(TOP)/frameworks/av/media/libstagefright/mpeg2ts \ -LOCAL_CFLAGS += -Werror - LOCAL_SHARED_LIBRARIES:= \ libbinder \ libcutils \ |