diff options
| author | Chia-I Wu <olvaffe@gmail.com> | 2011-03-19 21:20:49 +0800 |
|---|---|---|
| committer | Chia-I Wu <olvaffe@gmail.com> | 2011-03-25 03:30:43 +0800 |
| commit | f84d94632227ace654d3f9e7e0e4a686ef906483 (patch) | |
| tree | 4eef3995ac38f7fb4cde46624000d1d8b02e9543 /src/gralloc | |
| parent | 66c6b2520d0b51b51e9632146db92ab4cad30762 (diff) | |
android: fix building
Diffstat (limited to 'src/gralloc')
| -rw-r--r-- | src/gralloc/Android.mk | 59 |
1 files changed, 25 insertions, 34 deletions
diff --git a/src/gralloc/Android.mk b/src/gralloc/Android.mk index cf85517d6d..e50060ee65 100644 --- a/src/gralloc/Android.mk +++ b/src/gralloc/Android.mk @@ -1,56 +1,47 @@ # Android.mk for gralloc LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) -common_SRC_FILES := \ +LOCAL_SRC_FILES := \ gralloc_gem.c \ gralloc_kms.c \ gralloc_mod.c -common_C_INCLUDES := \ +LOCAL_C_INCLUDES := \ external/drm \ external/drm/include/drm -common_SHARED_LIBRARIES := \ +LOCAL_SHARED_LIBRARIES := \ libdrm \ liblog \ - libcutils - -ifeq ($(strip $(MESA_BUILD_INTEL)),true) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(common_SRC_FILES) \ - gralloc_gem_i915.c - -LOCAL_C_INCLUDES := \ - $(common_C_INCLUDES) \ - external/drm/intel - -LOCAL_SHARED_LIBRARIES := \ - $(common_SHARED_LIBRARIES) \ - libdrm_intel \ + libcutils \ libEGL -LOCAL_MODULE := gralloc.mesa -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw - -include $(BUILD_SHARED_LIBRARY) +ifeq ($(strip $(MESA_BUILD_INTEL)),true) +LOCAL_SRC_FILES += gralloc_gem_intel.c +LOCAL_C_INCLUDES += external/drm/intel +LOCAL_CFLAGS += -DENABLE_INTEL +LOCAL_SHARED_LIBRARIES += libdrm_intel endif # MESA_BUILD_INTEL -ifeq ($(strip $(MESA_BUILD_GALLIUM)),true) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(common_SRC_FILES) \ - gralloc_gem_pipe.c +ifeq ($(strip $(MESA_BUILD_RADEON)),true) +LOCAL_SRC_FILES += gralloc_gem_radeon.c +LOCAL_C_INCLUDES += external/drm/radeon +LOCAL_CFLAGS += -DENABLE_RADEON +LOCAL_SHARED_LIBRARIES += libdrm_radeon +endif # MESA_BUILD_INTEL -LOCAL_C_INCLUDES := \ - $(common_C_INCLUDES) \ +# this is broken +ifeq ($(strip $(MESA_BUILD_VMWGFX)),true) +LOCAL_SRC_FILES += gralloc_gem_pipe.c +LOCAL_C_INCLUDES += \ external/mesa/src/gallium/include \ external/mesa/src/gallium/auxiliary +LOCAL_CFLAGS += -DENABLE_VMWGFX +endif # MESA_BUILD_VMWGFX -LOCAL_MODULE := libmesa_st_gralloc +LOCAL_MODULE := gralloc.mesa +LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw -include $(BUILD_STATIC_LIBRARY) -endif # MESA_BUILD_GALLIUM +include $(BUILD_SHARED_LIBRARY) |