Skip to content

Commit

Permalink
display: Use LOCAL_VENDOR_MODULE
Browse files Browse the repository at this point in the history 
Avoids hardcoding paths in vendor
Change-Id: I6411c27cebfd8bc1d65bc84942b4c2621f64e420
CRs-Fixed: 2048581
  • Loading branch information
@naseer
naseer authored and Gerrit - the friendly Code Review server committed Jun 14, 2017
1 parent bd80422 commit 5be1b7a
Show file tree
Hide file tree
Showing 14 changed files with 17 additions and 99 deletions.
7 changes: 1 addition & 6 deletions gpu_tonemapper/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,7 @@ include $(BUILD_COPY_HEADERS)

include $(CLEAR_VARS)
LOCAL_MODULE := libgpu_tonemapper

ifneq ($(TARGET_IS_HEADLESS), true)
LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
endif

LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := $(TARGET_OUT_HEADERS)/qcom/display/
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
Expand Down
7 changes: 1 addition & 6 deletions hdmi_cec/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,7 @@ include $(LOCAL_PATH)/../common.mk
include $(CLEAR_VARS)

LOCAL_MODULE := hdmi_cec.$(TARGET_BOARD_PLATFORM)

ifneq ($(TARGET_IS_HEADLESS), true)
LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
endif

LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := $(common_includes)
Expand Down
7 changes: 1 addition & 6 deletions libcopybit/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,7 @@ include $(BUILD_COPY_HEADERS)
include $(CLEAR_VARS)
ifneq ($(TARGET_USES_GRALLOC1), true)
LOCAL_MODULE := copybit.$(TARGET_BOARD_PLATFORM)

ifneq ($(TARGET_IS_HEADLESS), true)
LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
endif

LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
Expand Down
7 changes: 1 addition & 6 deletions libdrmutils/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)

LOCAL_MODULE := libdrmutils

ifneq ($(TARGET_IS_HEADLESS), true)
LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
endif

LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := external/libdrm \
$(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
Expand Down
14 changes: 2 additions & 12 deletions libgralloc/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,7 @@ include $(LOCAL_PATH)/../common.mk
include $(CLEAR_VARS)

LOCAL_MODULE := gralloc.$(TARGET_BOARD_PLATFORM)

ifneq ($(TARGET_IS_HEADLESS), true)
LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
endif

LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
Expand All @@ -44,12 +39,7 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)

LOCAL_MODULE := libmemalloc

ifneq ($(TARGET_IS_HEADLESS), true)
LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
endif

LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
LOCAL_HEADER_LIBRARIES := display_headers
Expand Down
12 changes: 2 additions & 10 deletions libgralloc1/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@ include $(LOCAL_PATH)/../common.mk
include $(CLEAR_VARS)

LOCAL_MODULE := gralloc.$(TARGET_BOARD_PLATFORM)

ifneq ($(TARGET_IS_HEADLESS), true)
LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
endif

LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := $(common_includes) \
Expand All @@ -32,10 +27,7 @@ include $(BUILD_SHARED_LIBRARY)
#libgrallocutils
include $(CLEAR_VARS)
LOCAL_MODULE := libgrallocutils
ifneq ($(TARGET_IS_HEADLESS), true)
LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
endif
LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
LOCAL_HEADER_LIBRARIES := display_headers
Expand Down
6 changes: 1 addition & 5 deletions liblight/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ LOCAL_CFLAGS := -DLOG_TAG=\"qdlights\"
LOCAL_CLANG := true
LOCAL_MODULE := lights.$(TARGET_BOARD_PLATFORM)
LOCAL_MODULE_TAGS := optional

ifneq ($(TARGET_IS_HEADLESS), true)
LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
endif
LOCAL_VENDOR_MODULE := true

include $(BUILD_SHARED_LIBRARY)
7 changes: 1 addition & 6 deletions libmemtrack/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)

LOCAL_MODULE_RELATIVE_PATH := hw

ifneq ($(TARGET_IS_HEADLESS), true)
LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
endif

LOCAL_VENDOR_MODULE := true
LOCAL_C_INCLUDES += hardware/libhardware/include
LOCAL_CFLAGS := -Wconversion -Wall -Werror -Wno-sign-conversion
LOCAL_CLANG := true
Expand Down
14 changes: 2 additions & 12 deletions libqdutils/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,7 @@ include $(LOCAL_PATH)/../common.mk
include $(CLEAR_VARS)

LOCAL_MODULE := libqdutils

ifneq ($(TARGET_IS_HEADLESS), true)
LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
endif

LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional
LOCAL_SHARED_LIBRARIES := $(common_libs) libbinder libqservice
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
Expand Down Expand Up @@ -36,12 +31,7 @@ LOCAL_CFLAGS += -DLOG_TAG=\"DisplayMetaData\"

LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libqdMetaData

ifneq ($(TARGET_IS_HEADLESS), true)
LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
endif

LOCAL_VENDOR_MODULE := true
include $(BUILD_SHARED_LIBRARY)


Expand Down
7 changes: 1 addition & 6 deletions libqservice/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,7 @@ include $(LOCAL_PATH)/../common.mk
include $(CLEAR_VARS)

LOCAL_MODULE := libqservice

ifneq ($(TARGET_IS_HEADLESS), true)
LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
endif

LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
LOCAL_SHARED_LIBRARIES := $(common_libs) libbinder
Expand Down
7 changes: 1 addition & 6 deletions sdm/libs/core/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,7 @@ include $(CLEAR_VARS)
include $(LOCAL_PATH)/../../../common.mk

LOCAL_MODULE := libsdmcore

ifneq ($(TARGET_IS_HEADLESS), true)
LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
endif

LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
LOCAL_HEADER_LIBRARIES := display_headers
Expand Down
7 changes: 1 addition & 6 deletions sdm/libs/hwc/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@ include $(LOCAL_PATH)/../../../common.mk
ifeq ($(use_hwc2),false)

LOCAL_MODULE := hwcomposer.$(TARGET_BOARD_PLATFORM)

ifneq ($(TARGET_IS_HEADLESS), true)
LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
endif

LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := $(common_includes)
Expand Down
7 changes: 1 addition & 6 deletions sdm/libs/hwc2/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@ include $(LOCAL_PATH)/../../../common.mk
ifeq ($(use_hwc2),true)

LOCAL_MODULE := hwcomposer.$(TARGET_BOARD_PLATFORM)

ifneq ($(TARGET_IS_HEADLESS), true)
LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
endif

LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := $(common_includes)
Expand Down
7 changes: 1 addition & 6 deletions sdm/libs/utils/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,7 @@ include $(CLEAR_VARS)
include $(LOCAL_PATH)/../../../common.mk

LOCAL_MODULE := libsdmutils

ifneq ($(TARGET_IS_HEADLESS), true)
LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
endif

LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := $(common_includes)
LOCAL_HEADER_LIBRARIES := display_headers
Expand Down

0 comments on commit 5be1b7a

Please sign in to comment.