diff options
author | Yang Ni <yangni@google.com> | 2015-08-10 17:07:57 -0700 |
---|---|---|
committer | Yang Ni <yangni@google.com> | 2015-08-10 17:17:50 -0700 |
commit | 4720b041f19d864ae5b80bbef71f691db6806f8b (patch) | |
tree | 333a3f378d138bb772cc266d7e5cea7d55497057 | |
parent | 43a3f2149b5d3417cc5dc843032ecf05a890c147 (diff) | |
download | opencv3-4720b041f19d864ae5b80bbef71f691db6806f8b.tar.gz |
Fixed compilation error on 3rdparty of opencv3
Change-Id: Ia02695dbe204544c73d4a1f34a8ccc92022737c8
(cherry picked from commit 2d641c160198a198669c3d25d62a6b09afc0cb57)
-rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -314,7 +314,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_RTTI_FLAG := -frtti -LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%) -DEXCLUDE_MIF_SUPPORT -DEXCLUDE_PNM_SUPPORT -DEXCLUDE_BMP_SUPPORT -DEXCLUDE_RAS_SUPPORT -DEXCLUDE_JPG_SUPPORT -DEXCLUDE_PGX_SUPPORT +LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%) -DEXCLUDE_MIF_SUPPORT -DEXCLUDE_PNM_SUPPORT -DEXCLUDE_BMP_SUPPORT -DEXCLUDE_RAS_SUPPORT -DEXCLUDE_JPG_SUPPORT -DEXCLUDE_PGX_SUPPORT -w LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/3rdparty/libjasper \ @@ -441,7 +441,7 @@ LOCAL_RTTI_FLAG := -frtti LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -lz -LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%) +LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%) -w LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/3rdparty/libtiff \ |