diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-16 15:31:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-16 15:31:18 -0700 |
| commit | 1a42aee5e1e975158da4754f9bae46c945e27281 (patch) | |
| tree | a53726fd44407323ef9cb2adcb8913d78c4143c8 /media/libstagefright/codecs/avc/enc/Android.mk | |
| parent | 9bd763d1d3b7dcb30320aa70597680a53ffb5bbf (diff) | |
| parent | a109e9d5d5dbdbbd63a3f32fce131c718f0f8c99 (diff) | |
| download | frameworks_av-1a42aee5e1e975158da4754f9bae46c945e27281.zip frameworks_av-1a42aee5e1e975158da4754f9bae46c945e27281.tar.gz frameworks_av-1a42aee5e1e975158da4754f9bae46c945e27281.tar.bz2 | |
am a109e9d5: am b7ca7dc9: Merge "avcenc: Clarify the ifdefs surrounding inline assembly"
* commit 'a109e9d5d5dbdbbd63a3f32fce131c718f0f8c99':
avcenc: Clarify the ifdefs surrounding inline assembly
Diffstat (limited to 'media/libstagefright/codecs/avc/enc/Android.mk')
| -rw-r--r-- | media/libstagefright/codecs/avc/enc/Android.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/avc/enc/Android.mk b/media/libstagefright/codecs/avc/enc/Android.mk index 0aecfa8..d9ebdf5 100644 --- a/media/libstagefright/codecs/avc/enc/Android.mk +++ b/media/libstagefright/codecs/avc/enc/Android.mk @@ -28,7 +28,6 @@ LOCAL_C_INCLUDES := \ $(TOP)/frameworks/native/include/media/openmax LOCAL_CFLAGS := \ - -D__arm__ \ -DOSCL_IMPORT_REF= -DOSCL_UNUSED_ARG= -DOSCL_EXPORT_REF= include $(BUILD_STATIC_LIBRARY) |