diff options
| author | Lajos Molnar <lajos@google.com> | 2014-10-14 01:22:34 -0700 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2014-10-14 01:22:34 -0700 |
| commit | 4fed5e4e7f2eb744b9f2e3c52ec23539256cdbca (patch) | |
| tree | 81d9bfcce0f53bf27e8c9579968fdc630ebe8359 /media/libstagefright/codecs/on2/enc/Android.mk | |
| parent | 5a2d81752e714e206114ff3d4a9892880d28f64e (diff) | |
| parent | 2edda09a2ad1d112c52acd37d323f63f0a492d67 (diff) | |
| download | frameworks_av-4fed5e4e7f2eb744b9f2e3c52ec23539256cdbca.zip frameworks_av-4fed5e4e7f2eb744b9f2e3c52ec23539256cdbca.tar.gz frameworks_av-4fed5e4e7f2eb744b9f2e3c52ec23539256cdbca.tar.bz2 | |
resolved conflicts for merge of 2edda09a to lmp-dev-plus-aosp
Change-Id: I760286b72fe1ebda3e8b058ca2138cb97fbdb7e1
Diffstat (limited to 'media/libstagefright/codecs/on2/enc/Android.mk')
| -rw-r--r-- | media/libstagefright/codecs/on2/enc/Android.mk | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/media/libstagefright/codecs/on2/enc/Android.mk b/media/libstagefright/codecs/on2/enc/Android.mk index 4060a0a..e265104 100644 --- a/media/libstagefright/codecs/on2/enc/Android.mk +++ b/media/libstagefright/codecs/on2/enc/Android.mk @@ -12,10 +12,6 @@ LOCAL_C_INCLUDES := \ frameworks/av/media/libstagefright/include \ frameworks/native/include/media/openmax \ -ifeq ($(TARGET_DEVICE), manta) - LOCAL_CFLAGS += -DSURFACE_IS_BGR32 -endif - LOCAL_STATIC_LIBRARIES := \ libvpx |