diff options
| author | Ying Wang <wangying@google.com> | 2012-12-04 12:04:44 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-12-04 12:04:44 -0800 |
| commit | ac0de62ba3f86400f08c3791ba56b6cb057e1dfa (patch) | |
| tree | 8030fa86f90a87890e4ae165cd7d59b6cf0c73da | |
| parent | 653078f652a7945756c2b02e294155a8345a5a1c (diff) | |
| download | frameworks_native-ac0de62ba3f86400f08c3791ba56b6cb057e1dfa.zip frameworks_native-ac0de62ba3f86400f08c3791ba56b6cb057e1dfa.tar.gz frameworks_native-ac0de62ba3f86400f08c3791ba56b6cb057e1dfa.tar.bz2 | |
Use LOCAL_REQUIRED_MODULES to establish dependency
instead of using the tricky order-only dependency on a phony target
module name.
Change-Id: I691f2d352d1bd7f619bdb0b75070709e1b8222c0
| -rw-r--r-- | opengl/libs/Android.mk | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk index 31bfcd7..6c35355 100644 --- a/opengl/libs/Android.mk +++ b/opengl/libs/Android.mk @@ -4,6 +4,20 @@ LOCAL_PATH:= $(call my-dir) # 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) LOCAL_SRC_FILES:= \ @@ -65,24 +79,10 @@ ifneq ($(MAX_EGL_CACHE_SIZE),) LOCAL_CFLAGS += -DMAX_EGL_CACHE_SIZE=$(MAX_EGL_CACHE_SIZE) endif -include $(BUILD_SHARED_LIBRARY) -installed_libEGL := $(LOCAL_INSTALLED_MODULE) +LOCAL_REQUIRED_MODULES := $(egl.cfg_config_module) +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) - -# make sure we depend on egl.cfg, so it gets installed -$(installed_libEGL): | egl.cfg - -endif +include $(BUILD_SHARED_LIBRARY) ############################################################################### # Build the wrapper OpenGL ES 1.x library |