projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
egl: drop unused _EGLDriver from Initialize()
[mesa.git]
/
src
/
egl
/
Android.mk
diff --git
a/src/egl/Android.mk
b/src/egl/Android.mk
index 516b53c6255ff04cb7edba57485858f0b033e53d..83bd442dea17bc26252a4efdfac74d06f6ae9e3f 100644
(file)
--- a/
src/egl/Android.mk
+++ b/
src/egl/Android.mk
@@
-36,63
+36,60
@@
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
$(LIBEGL_C_FILES) \
$(dri2_backend_core_FILES) \
LOCAL_SRC_FILES := \
$(LIBEGL_C_FILES) \
$(dri2_backend_core_FILES) \
- drivers/dri2/platform_android.c
+ drivers/dri2/platform_device.c \
+ drivers/dri2/platform_android.c \
+ drivers/dri2/platform_surfaceless.c \
LOCAL_CFLAGS := \
-D_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_ANDROID \
LOCAL_CFLAGS := \
-D_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_ANDROID \
- -D_EGL_BUILT_IN_DRIVER_DRI2 \
-DHAVE_ANDROID_PLATFORM
-DHAVE_ANDROID_PLATFORM
-ifeq ($(MESA_LOLLIPOP_BUILD),true)
-LOCAL_CFLAGS_arm := -DDEFAULT_DRIVER_DIR=\"/system/lib/dri\"
-LOCAL_CFLAGS_x86 := -DDEFAULT_DRIVER_DIR=\"/system/lib/dri\"
-LOCAL_CFLAGS_x86_64 := -DDEFAULT_DRIVER_DIR=\"/system/lib64/dri\"
-else
-LOCAL_CFLAGS += -DDEFAULT_DRIVER_DIR=\"/system/lib/dri\"
-endif
-
LOCAL_C_INCLUDES := \
LOCAL_C_INCLUDES := \
- $(
DRM_GRALLOC_TOP)
\
+ $(
MESA_TOP)/include
\
$(MESA_TOP)/src/egl/main \
$(MESA_TOP)/src/egl/main \
- $(MESA_TOP)/src/egl/drivers/dri2
\
+ $(MESA_TOP)/src/egl/drivers/dri2
LOCAL_STATIC_LIBRARIES := \
LOCAL_STATIC_LIBRARIES := \
+ libmesa_util \
libmesa_loader
LOCAL_SHARED_LIBRARIES := \
libdl \
libmesa_loader
LOCAL_SHARED_LIBRARIES := \
libdl \
+ libglapi \
libhardware \
liblog \
libcutils \
libhardware \
liblog \
libcutils \
- lib
gralloc_drm \
+ lib
sync
-ifeq ($(shell echo "$(MESA_ANDROID_VERSION) >= 4.2" | bc),1)
-LOCAL_SHARED_LIBRARIES += libsync
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0)
+LOCAL_C_INCLUDES += \
+ frameworks/native/libs/nativewindow/include \
+ frameworks/native/libs/arect/include
+LOCAL_HEADER_LIBRARIES += libnativebase_headers
endif
endif
-# add libdrm if there are hardware drivers
-ifneq ($(filter-out swrast,$(MESA_GPU_DRIVERS)),)
-LOCAL_CFLAGS += -DHAVE_LIBDRM
-LOCAL_SHARED_LIBRARIES += libdrm
+ifeq ($(BOARD_USES_DRM_GRALLOC),true)
+ LOCAL_CFLAGS += -DHAVE_DRM_GRALLOC
+ LOCAL_SHARED_LIBRARIES += libgralloc_drm
endif
endif
-ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
-# require i915_dri and/or i965_dri
-LOCAL_REQUIRED_MODULES += \
- $(addsuffix _dri, $(filter i915 i965, $(MESA_GPU_DRIVERS)))
-endif # MESA_BUILD_CLASSIC
+ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),)
+LOCAL_SHARED_LIBRARIES += libnativewindow
+endif
-ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
+# This controls enabling building of driver libraries
+ifneq ($(HAVE_I915_DRI),)
+LOCAL_REQUIRED_MODULES += i915_dri
+endif
+ifneq ($(HAVE_I965_DRI),)
+LOCAL_REQUIRED_MODULES += i965_dri
+endif
+ifneq ($(MESA_BUILD_GALLIUM),)
LOCAL_REQUIRED_MODULES += gallium_dri
LOCAL_REQUIRED_MODULES += gallium_dri
-endif # MESA_BUILD_GALLIUM
-
+endif
LOCAL_MODULE := libGLES_mesa
LOCAL_MODULE := libGLES_mesa
-ifeq ($(MESA_LOLLIPOP_BUILD),true)
LOCAL_MODULE_RELATIVE_PATH := egl
LOCAL_MODULE_RELATIVE_PATH := egl
-else
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl
-endif
include $(MESA_COMMON_MK)
include $(BUILD_SHARED_LIBRARY)
include $(MESA_COMMON_MK)
include $(BUILD_SHARED_LIBRARY)