X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Android.mk;h=fdbf22fe643aec953feff3d9cce75efd36977a44;hb=d823440fed0a8d5b20b2b2d42946b24675326bb6;hp=33f1d1411315b0934afa6d3f8d1b796bd3f2b9e2;hpb=d77fa310ed8fb54aafc017eae844a51407ca907c;p=mesa.git diff --git a/Android.mk b/Android.mk index 33f1d141131..fdbf22fe643 100644 --- a/Android.mk +++ b/Android.mk @@ -32,15 +32,6 @@ MESA_TOP := $(call my-dir) MESA_ANDROID_MAJOR_VERSION := $(word 1, $(subst ., , $(PLATFORM_VERSION))) -MESA_ANDROID_MINOR_VERSION := $(word 2, $(subst ., , $(PLATFORM_VERSION))) -MESA_ANDROID_VERSION := $(MESA_ANDROID_MAJOR_VERSION).$(MESA_ANDROID_MINOR_VERSION) -ifeq ($(filter 1 2 3 4,$(MESA_ANDROID_MAJOR_VERSION)),) -MESA_LOLLIPOP_BUILD := true -else -define local-generated-sources-dir -$(call local-intermediates-dir) -endef -endif MESA_DRI_MODULE_REL_PATH := dri MESA_DRI_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/$(MESA_DRI_MODULE_REL_PATH) @@ -97,7 +88,8 @@ SUBDIRS := \ src/egl \ src/amd \ src/intel \ - src/mesa/drivers/dri + src/mesa/drivers/dri \ + src/vulkan INC_DIRS := $(call all-named-subdir-makefiles,$(SUBDIRS))