diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-03-14 14:22:08 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2014-03-14 14:22:08 -0700 |
| commit | 758799cef41fc5495f59eeb6249d02ce9154cde8 (patch) | |
| tree | 5cbfa825fd668d81c6fe6a8ec485dd8ebb2fd151 /libvideoeditor | |
| parent | beb57a5a08207af80180b93dd80d611a85997c43 (diff) | |
| parent | 3c7801882bbb6d5f3cc641525a54cb8a6c4aca34 (diff) | |
| download | frameworks_av-758799cef41fc5495f59eeb6249d02ce9154cde8.zip frameworks_av-758799cef41fc5495f59eeb6249d02ce9154cde8.tar.gz frameworks_av-758799cef41fc5495f59eeb6249d02ce9154cde8.tar.bz2 | |
resolved conflicts for merge of 3c780188 to master
Change-Id: Ic579d346c27ff05ea6444faaa60fa6caaec86fbf
Diffstat (limited to 'libvideoeditor')
| -rwxr-xr-x | libvideoeditor/lvpp/Android.mk | 2 | ||||
| -rwxr-xr-x | libvideoeditor/vss/src/Android.mk | 2 | ||||
| -rwxr-xr-x | libvideoeditor/vss/stagefrightshells/src/Android.mk | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/libvideoeditor/lvpp/Android.mk b/libvideoeditor/lvpp/Android.mk index 860d351..77a21ac 100755 --- a/libvideoeditor/lvpp/Android.mk +++ b/libvideoeditor/lvpp/Android.mk @@ -99,6 +99,8 @@ LOCAL_CFLAGS += -Wno-multichar \ -DUSE_STAGEFRIGHT_READERS \ -DUSE_STAGEFRIGHT_3GPP_READER +LOCAL_32_BIT_ONLY := true + include $(BUILD_SHARED_LIBRARY) #include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/libvideoeditor/vss/src/Android.mk b/libvideoeditor/vss/src/Android.mk index 0caa15b..8856c41 100755 --- a/libvideoeditor/vss/src/Android.mk +++ b/libvideoeditor/vss/src/Android.mk @@ -96,4 +96,6 @@ LOCAL_CFLAGS += -Wno-multichar \ -DM4xVSS_RESERVED_MOOV_DISK_SPACEno \ -DDECODE_GIF_ON_SAVING +LOCAL_32_BIT_ONLY := true + include $(BUILD_SHARED_LIBRARY) diff --git a/libvideoeditor/vss/stagefrightshells/src/Android.mk b/libvideoeditor/vss/stagefrightshells/src/Android.mk index 9188942..a060c0d 100755 --- a/libvideoeditor/vss/stagefrightshells/src/Android.mk +++ b/libvideoeditor/vss/stagefrightshells/src/Android.mk @@ -64,4 +64,6 @@ LOCAL_MODULE:= libvideoeditor_stagefrightshells LOCAL_MODULE_TAGS := optional +LOCAL_32_BIT_ONLY := true + include $(BUILD_STATIC_LIBRARY) |