Use LOCAL_REQUIRED_MODULES to establish dependency
instead of using the tricky order-only dependency on a phony target module name. Change-Id: I691f2d352d1bd7f619bdb0b75070709e1b8222c0
This commit is contained in:
parent
653078f652
commit
ac0de62ba3
|
@ -4,6 +4,20 @@ LOCAL_PATH:= $(call my-dir)
|
||||||
# Build META EGL library
|
# Build META EGL library
|
||||||
#
|
#
|
||||||
|
|
||||||
|
egl.cfg_config_module :=
|
||||||
|
# OpenGL drivers config file
|
||||||
|
ifneq ($(BOARD_EGL_CFG),)
|
||||||
|
|
||||||
|
include $(CLEAR_VARS)
|
||||||
|
LOCAL_MODULE := egl.cfg
|
||||||
|
LOCAL_MODULE_TAGS := optional
|
||||||
|
LOCAL_MODULE_CLASS := ETC
|
||||||
|
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/egl
|
||||||
|
LOCAL_SRC_FILES := ../../../../$(BOARD_EGL_CFG)
|
||||||
|
include $(BUILD_PREBUILT)
|
||||||
|
egl.cfg_config_module := $(LOCAL_MODULE)
|
||||||
|
endif
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
|
|
||||||
LOCAL_SRC_FILES:= \
|
LOCAL_SRC_FILES:= \
|
||||||
|
@ -65,24 +79,10 @@ ifneq ($(MAX_EGL_CACHE_SIZE),)
|
||||||
LOCAL_CFLAGS += -DMAX_EGL_CACHE_SIZE=$(MAX_EGL_CACHE_SIZE)
|
LOCAL_CFLAGS += -DMAX_EGL_CACHE_SIZE=$(MAX_EGL_CACHE_SIZE)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
LOCAL_REQUIRED_MODULES := $(egl.cfg_config_module)
|
||||||
|
egl.cfg_config_module :=
|
||||||
|
|
||||||
include $(BUILD_SHARED_LIBRARY)
|
include $(BUILD_SHARED_LIBRARY)
|
||||||
installed_libEGL := $(LOCAL_INSTALLED_MODULE)
|
|
||||||
|
|
||||||
# OpenGL drivers config file
|
|
||||||
ifneq ($(BOARD_EGL_CFG),)
|
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
|
||||||
LOCAL_MODULE := egl.cfg
|
|
||||||
LOCAL_MODULE_TAGS := optional
|
|
||||||
LOCAL_MODULE_CLASS := ETC
|
|
||||||
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/egl
|
|
||||||
LOCAL_SRC_FILES := ../../../../$(BOARD_EGL_CFG)
|
|
||||||
include $(BUILD_PREBUILT)
|
|
||||||
|
|
||||||
# make sure we depend on egl.cfg, so it gets installed
|
|
||||||
$(installed_libEGL): | egl.cfg
|
|
||||||
|
|
||||||
endif
|
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# Build the wrapper OpenGL ES 1.x library
|
# Build the wrapper OpenGL ES 1.x library
|
||||||
|
|
Loading…
Reference in New Issue