diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-12-17 15:56:06 -0800 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2014-12-17 15:56:06 -0800 |
| commit | b5267ef782ebd3652995cfdbc46d28cfb41d2e32 (patch) | |
| tree | 3f1765204566bb4ca9f86adb7e2de44220f4e9f2 /va | |
| parent | d98bfbd539d624570ed846d163965689775762ea (diff) | |
| parent | c0e99e5a3d4bc7bfcec622b39f5075d280daa949 (diff) | |
| download | libva-b5267ef782ebd3652995cfdbc46d28cfb41d2e32.tar.gz | |
resolved conflicts for merge of c0e99e5a to lmp-mr1-dev-plus-aosp
Change-Id: I463fb75ca9bef94e5734ed984db72bbd0e04a31f
Diffstat (limited to 'va')
| -rwxr-xr-x | va/Android.mk | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/va/Android.mk b/va/Android.mk index eae7993..3a66ee5 100755 --- a/va/Android.mk +++ b/va/Android.mk @@ -28,6 +28,10 @@ LOCAL_PATH:= $(call my-dir) ifeq ($(ENABLE_IMG_GRAPHICS),true) LIBVA_DRIVERS_PATH = /system/lib + +# Clang does not like partially initialized structures +# in va_fool.c, va.c and va_drm_utils.c. + include $(CLEAR_VARS) LOCAL_SRC_FILES := \ @@ -35,6 +39,8 @@ LOCAL_SRC_FILES := \ va_trace.c \ va_fool.c +LOCAL_CLANG_CFLAGS += -Wno-missing-field-initializers + LOCAL_CFLAGS := \ -DANDROID \ -DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\"" \ @@ -94,6 +100,8 @@ LOCAL_SRC_FILES := \ LOCAL_CFLAGS := \ -DANDROID -DLOG_TAG=\"libva-android\" +LOCAL_CLANG_CFLAGS += -Wno-missing-field-initializers + LOCAL_C_INCLUDES := \ $(TARGET_OUT_HEADERS)/libva \ $(TARGET_OUT_HEADERS)/libdrm \ @@ -143,6 +151,8 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) +LOCAL_CLANG_CFLAGS += -Wno-missing-field-initializers + LOCAL_SRC_FILES := va_tpi.c LOCAL_CFLAGS := -DANDROID -DLOG_TAG=\"libva-tpi\" |