Permalink
Browse files

Update and clean makefiles for building in CM-10.1

Change-Id: I6c42b99b86f7ebb30961f73c0f4ba74ab510c957
  • Loading branch information...
1 parent 6ccd602 commit 12f8a612b2d74c14705995d36f24c34ece2d5f6a @arco committed Apr 10, 2013
View
2 Android.mk
@@ -1,4 +1,5 @@
ifeq ($(call is-vendor-board-platform,QCOM),true)
+ifeq ($(TARGET_QCOM_DISPLAY_VARIANT),legacy)
display-hals := libgralloc libgenlock libcopybit
display-hals += libhwcomposer liboverlay libqdutils libexternal libqservice
@@ -9,3 +10,4 @@ endif
include $(call all-named-subdir-makefiles,$(display-hals))
endif
+endif
View
32 common.mk
@@ -1,20 +1,19 @@
#Common headers
-common_includes := hardware/qcom/display/libgralloc
-common_includes += hardware/qcom/display/libgenlock
-common_includes += hardware/qcom/display/liboverlay
-common_includes += hardware/qcom/display/libcopybit
-common_includes += hardware/qcom/display/libqdutils
-common_includes += hardware/qcom/display/libhwcomposer
-common_includes += hardware/qcom/display/libexternal
-common_includes += hardware/qcom/display/libqservice
+common_includes := hardware/qcom/display-legacy/libgralloc
+common_includes += hardware/qcom/display-legacy/libgenlock
+common_includes += hardware/qcom/display-legacy/liboverlay
+common_includes += hardware/qcom/display-legacy/libcopybit
+common_includes += hardware/qcom/display-legacy/libqdutils
+common_includes += hardware/qcom/display-legacy/libhwcomposer
+common_includes += hardware/qcom/display-legacy/libexternal
+common_includes += hardware/qcom/display-legacy/libqservice
ifeq ($(TARGET_USES_POST_PROCESSING),true)
common_flags += -DUSES_POST_PROCESSING
common_includes += $(TARGET_OUT_HEADERS)/pp/inc
endif
-
-#Common libraries external to display HAL
+#Common libraries external to display-legacy HAL
common_libs := liblog libutils libcutils libhardware
#Common C flags
@@ -27,6 +26,10 @@ ifeq ($(TARGET_BOARD_PLATFORM), msm8960)
common_flags += -DUSE_FENCE_SYNC
endif
+ifeq ($(TARGET_USES_ION),true)
+ common_flags += -DUSE_ION
+endif
+
ifeq ($(ARCH_ARM_HAVE_NEON),true)
common_flags += -D__ARM_HAVE_NEON
endif
@@ -38,12 +41,3 @@ endif
ifeq ($(TARGET_QCOM_HDMI_RESOLUTION_AUTO),true)
common_flags += -DFORCE_AUTO_RESOLUTION
endif
-
-common_deps :=
-kernel_includes :=
-
-#Kernel includes. Not being executed on JB+
-ifeq ($(call is-vendor-board-platform,QCOM),true)
- common_deps += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
- kernel_includes += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-endif
View
5 libcopybit/Android.mk
@@ -19,17 +19,16 @@ include $(CLEAR_VARS)
LOCAL_MODULE := copybit.$(TARGET_BOARD_PLATFORM)
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
+LOCAL_C_INCLUDES := $(common_includes)
LOCAL_SHARED_LIBRARIES := $(common_libs) libdl libmemalloc
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdcopybit\"
-LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
ifeq ($(TARGET_USES_C2D_COMPOSITION),true)
LOCAL_CFLAGS += -DCOPYBIT_Z180=1 -DC2D_SUPPORT_DISPLAY=1
LOCAL_SRC_FILES := copybit_c2d.cpp software_converter.cpp
include $(BUILD_SHARED_LIBRARY)
else
- ifneq ($(call is-chipset-in-board-platform,msm7630),true)
+ ifneq ($(call is-chipset-in-board-platform,msm7x30),true)
ifeq ($(call is-board-platform-in-list,$(MSM7K_BOARD_PLATFORMS)),true)
LOCAL_CFLAGS += -DCOPYBIT_MSM7K=1
LOCAL_SRC_FILES := software_converter.cpp copybit.cpp
View
3 libexternal/Android.mk
@@ -5,10 +5,9 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libexternal
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
+LOCAL_C_INCLUDES := $(common_includes)
LOCAL_SHARED_LIBRARIES := $(common_libs) liboverlay
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdexternal\"
-LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
LOCAL_SRC_FILES := external.cpp
include $(BUILD_SHARED_LIBRARY)
View
1 libgenlock/Android.mk
@@ -10,7 +10,6 @@ LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdgenlock\"
ifneq ($(TARGET_BOARD_PLATFORM), msm8960)
LOCAL_CFLAGS += -DUSE_GENLOCK
endif
-LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
LOCAL_SRC_FILES := genlock.cpp
include $(BUILD_SHARED_LIBRARY)
View
7 libgralloc/Android.mk
@@ -20,11 +20,10 @@ include $(CLEAR_VARS)
LOCAL_MODULE := gralloc.$(TARGET_BOARD_PLATFORM)
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
+LOCAL_C_INCLUDES := $(common_includes)
LOCAL_SHARED_LIBRARIES := $(common_libs) libmemalloc libgenlock
LOCAL_SHARED_LIBRARIES += libqdutils libGLESv1_CM
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdgralloc\"
-LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)
LOCAL_SRC_FILES := gpu.cpp gralloc.cpp framebuffer.cpp mapper.cpp
include $(BUILD_SHARED_LIBRARY)
@@ -34,14 +33,12 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libmemalloc
LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
+LOCAL_C_INCLUDES := $(common_includes)
LOCAL_SHARED_LIBRARIES := $(common_libs) libgenlock
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdmemalloc\"
-LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)
LOCAL_SRC_FILES := alloc_controller.cpp
ifeq ($(TARGET_USES_ION),true)
LOCAL_SRC_FILES += ionalloc.cpp
- LOCAL_CFLAGS += -DUSE_ION
else
LOCAL_SRC_FILES += ashmemalloc.cpp \
pmemalloc.cpp \
View
3 libhwcomposer/Android.mk
@@ -5,12 +5,11 @@ include $(CLEAR_VARS)
LOCAL_MODULE := hwcomposer.$(TARGET_BOARD_PLATFORM)
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
+LOCAL_C_INCLUDES := $(common_includes)
LOCAL_SHARED_LIBRARIES := $(common_libs) libEGL liboverlay libgenlock \
libexternal libqdutils libhardware_legacy \
libdl libmemalloc libqservice
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdhwcomposer\"
-LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
LOCAL_SRC_FILES := hwc.cpp \
hwc_video.cpp \
hwc_utils.cpp \
View
3 liboverlay/Android.mk
@@ -5,10 +5,9 @@ include $(CLEAR_VARS)
LOCAL_MODULE := liboverlay
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
+LOCAL_C_INCLUDES := $(common_includes)
LOCAL_SHARED_LIBRARIES := $(common_libs) libqdutils libmemalloc
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdoverlay\"
-LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
LOCAL_SRC_FILES := \
overlay.cpp \
overlayCtrl.cpp \
View
3 libqdutils/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libqdutils
LOCAL_MODULE_TAGS := optional
LOCAL_SHARED_LIBRARIES := $(common_libs)
-LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
+LOCAL_C_INCLUDES := $(common_includes)
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdutils\"
-LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
LOCAL_SRC_FILES := profiler.cpp mdp_version.cpp \
idle_invalidator.cpp
View
3 libqservice/Android.mk
@@ -5,10 +5,9 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libqservice
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
+LOCAL_C_INCLUDES := $(common_includes)
LOCAL_SHARED_LIBRARIES := $(common_libs) libexternal libbinder
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdqservice\"
-LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
LOCAL_SRC_FILES := QService.cpp \
IQService.cpp

0 comments on commit 12f8a61

Please sign in to comment.