diff options
| author | Rob Herring <robh@kernel.org> | 2017-03-21 13:51:20 -0500 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2017-03-22 17:53:31 +0000 |
| commit | 7a5b5f52260e33681b2aff6e544520c44f8710c0 (patch) | |
| tree | d87608c22e89058dc820e98fd1c4bf34de2d0b33 /Android.common.mk | |
| parent | 0e1ff22d55816c9a3710257c2e705a98ad3282bc (diff) | |
Android: drop Android 4.4 (KitKat) support
Any users of KitKat are likely using an older version of Mesa and
KitKat support adds complexity to the make files. Dropping support
allows removing the MESA_LOLLIPOP_BUILD make variable in various make
files.
Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'Android.common.mk')
| -rw-r--r-- | Android.common.mk | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/Android.common.mk b/Android.common.mk index cd576152da7..34db6770c5b 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -65,7 +65,9 @@ LOCAL_CFLAGS += \ LOCAL_CPPFLAGS += \ -D__STDC_CONSTANT_MACROS \ -D__STDC_FORMAT_MACROS \ - -D__STDC_LIMIT_MACROS + -D__STDC_LIMIT_MACROS \ + -Wno-error=non-virtual-dtor \ + -Wno-non-virtual-dtor # mesa requires at least c99 compiler LOCAL_CONLYFLAGS += \ @@ -102,17 +104,8 @@ LOCAL_SHARED_LIBRARIES += libdrm endif endif -LOCAL_CPPFLAGS += \ - $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-D_USING_LIBCXX) \ - -Wno-error=non-virtual-dtor \ - -Wno-non-virtual-dtor - -ifeq ($(MESA_LOLLIPOP_BUILD),true) - LOCAL_CFLAGS_32 += -DDEFAULT_DRIVER_DIR=\"/system/lib/$(MESA_DRI_MODULE_REL_PATH)\" - LOCAL_CFLAGS_64 += -DDEFAULT_DRIVER_DIR=\"/system/lib64/$(MESA_DRI_MODULE_REL_PATH)\" -else - LOCAL_CFLAGS += -DDEFAULT_DRIVER_DIR=\"/system/lib/$(MESA_DRI_MODULE_REL_PATH)\" -endif +LOCAL_CFLAGS_32 += -DDEFAULT_DRIVER_DIR=\"/system/lib/$(MESA_DRI_MODULE_REL_PATH)\" +LOCAL_CFLAGS_64 += -DDEFAULT_DRIVER_DIR=\"/system/lib64/$(MESA_DRI_MODULE_REL_PATH)\" # uncomment to keep the debug symbols #LOCAL_STRIP_MODULE := false |