diff options
| author | James Hawkins | 2016-02-23 17:57:18 -0600 |
|---|---|---|
| committer | James Hawkins | 2016-02-23 17:57:18 -0600 |
| commit | 7c7e7a61d2f01bab0ad961469c087c761bb47ec8 (patch) | |
| tree | 72f9e6711a662582e3e976a1fe8fe85a2033e907 /Android.mk | |
| parent | 5ba2bf74d75d9753f9aec1e83798070e78918109 (diff) | |
| parent | e298f1f8f5094b8a7f1eccdaf97bf107b4b5db47 (diff) | |
| download | external-libdrm-7c7e7a61d2f01bab0ad961469c087c761bb47ec8.tar.gz external-libdrm-7c7e7a61d2f01bab0ad961469c087c761bb47ec8.tar.xz external-libdrm-7c7e7a61d2f01bab0ad961469c087c761bb47ec8.zip | |
resolve merge conflicts of e298f1f8f5 to nyc-dev-plus-aosp
Change-Id: I92fda1fc05de05430ab634edb92c9dea341a7dfe
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 7 insertions, 1 deletions
| @@ -28,7 +28,13 @@ include $(LOCAL_PATH)/Makefile.sources | |||
| 28 | 28 | ||
| 29 | common_CFLAGS := \ | 29 | common_CFLAGS := \ |
| 30 | -DHAVE_VISIBILITY=1 \ | 30 | -DHAVE_VISIBILITY=1 \ |
| 31 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 | 31 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 \ |
| 32 | -Wno-enum-conversion \ | ||
| 33 | -Wno-missing-field-initializers \ | ||
| 34 | -Wno-pointer-arith \ | ||
| 35 | -Wno-sign-compare \ | ||
| 36 | -Wno-tautological-compare \ | ||
| 37 | -Wno-unused-parameter | ||
| 32 | 38 | ||
| 33 | # Static library for the device (recovery) | 39 | # Static library for the device (recovery) |
| 34 | include $(CLEAR_VARS) | 40 | include $(CLEAR_VARS) |