diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-11 22:05:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-11 22:05:19 +0000 |
| commit | 8e1554f35ffcc0f7ac833a796adf3926371fcb76 (patch) | |
| tree | 16a15b50c6cc47a120ccae11a8bc8fbd2a9d3ae6 /media/libstagefright/timedtext | |
| parent | 0f37620e0f79bfab1354e2e3049c260342a2637e (diff) | |
| parent | b1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9 (diff) | |
| download | frameworks_av-8e1554f35ffcc0f7ac833a796adf3926371fcb76.zip frameworks_av-8e1554f35ffcc0f7ac833a796adf3926371fcb76.tar.gz frameworks_av-8e1554f35ffcc0f7ac833a796adf3926371fcb76.tar.bz2 | |
am b1b1e303: am e5238893: Merge "Fix aosp_arm64 mirror-aosp-master build 1119326"
* commit 'b1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9':
Fix aosp_arm64 mirror-aosp-master build 1119326
Diffstat (limited to 'media/libstagefright/timedtext')
| -rw-r--r-- | media/libstagefright/timedtext/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/timedtext/Android.mk b/media/libstagefright/timedtext/Android.mk index 6a8b9fc..c4cfa17 100644 --- a/media/libstagefright/timedtext/Android.mk +++ b/media/libstagefright/timedtext/Android.mk @@ -9,7 +9,7 @@ LOCAL_SRC_FILES:= \ TimedTextSRTSource.cpp \ TimedTextPlayer.cpp -LOCAL_CFLAGS += -Wno-multichar -Werror +LOCAL_CFLAGS += -Wno-multichar LOCAL_C_INCLUDES:= \ $(TOP)/frameworks/av/include/media/stagefright/timedtext \ |