diff options
| author | Andrew P Boie <andrew.p.boie@intel.com> | 2013-01-10 16:46:44 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@otc-android.intel.com> | 2013-01-10 16:46:44 -0800 |
| commit | 16a747a9e551f462e559b14844fd20c3cde98b69 (patch) | |
| tree | 01c4b51107b9a453df453e3563cd66715f316e68 | |
| parent | cca14cfd68da631fb1b5d53f2951ffb1059fd7f7 (diff) | |
| parent | 05280dd7af5188e8187fbdcc6bbf5c451d17098d (diff) | |
| download | external_drm_gralloc-16a747a9e551f462e559b14844fd20c3cde98b69.zip external_drm_gralloc-16a747a9e551f462e559b14844fd20c3cde98b69.tar.gz external_drm_gralloc-16a747a9e551f462e559b14844fd20c3cde98b69.tar.bz2 | |
Merge "split gralloc.$(TARGET_PRODUCT)"
| -rw-r--r-- | Android.mk | 42 |
1 files changed, 33 insertions, 9 deletions
@@ -53,22 +53,35 @@ ifneq ($(strip $(DRM_GPU_DRIVERS)),) LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) -LOCAL_MODULE := gralloc.$(TARGET_PRODUCT) -LOCAL_MODULE_TAGS := optional +# Use the PREBUILT libraries ifeq ($(strip $(DRM_GPU_DRIVERS)),prebuilt) +include $(CLEAR_VARS) +LOCAL_MODULE := libgralloc_drm +LOCAL_MODULE_TAGS := optional +LOCAL_SRC_FILES := ../../$(BOARD_GPU_DRIVER_BINARY) +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_SUFFIX := $(TARGET_SHLIB_SUFFIX) +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := gralloc.$(TARGET_PRODUCT) +LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw/ LOCAL_SRC_FILES := ../../$(BOARD_GPU_DRIVER_BINARY) LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_MODULE_SUFFIX := $(TARGET_SHLIB_SUFFIX) include $(BUILD_PREBUILT) +# Use the sources else +include $(CLEAR_VARS) +LOCAL_MODULE := libgralloc_drm +LOCAL_MODULE_TAGS := optional + LOCAL_SRC_FILES := \ - gralloc.c \ gralloc_drm.c \ gralloc_drm_kms.c @@ -82,10 +95,6 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libhardware_legacy \ -# for glFlush/glFinish -LOCAL_SHARED_LIBRARIES += \ - libGLESv1_CM - ifneq ($(filter $(intel_drivers), $(DRM_GPU_DRIVERS)),) LOCAL_SRC_FILES += gralloc_drm_intel.c LOCAL_C_INCLUDES += external/drm/intel @@ -135,9 +144,24 @@ LOCAL_STATIC_LIBRARIES += \ libmesa_gallium LOCAL_SHARED_LIBRARIES += libdl endif # DRM_USES_PIPE +include $(BUILD_SHARED_LIBRARY) + + +include $(CLEAR_VARS) +LOCAL_SRC_FILES := \ + gralloc.c \ -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_SHARED_LIBRARIES := \ + libgralloc_drm \ + liblog \ +# for glFlush/glFinish +LOCAL_SHARED_LIBRARIES += \ + libGLESv1_CM + +LOCAL_MODULE := gralloc.$(TARGET_PRODUCT) +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw/ include $(BUILD_SHARED_LIBRARY) endif # DRM_GPU_DRIVERS=prebuilt |