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 @intervigilium
naseer authored and intervigilium committed Feb 19, 2018
1 parent eac53e7 commit d1d9702
Show file tree
Hide file tree
Showing 13 changed files with 15 additions and 89 deletions.
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 @@ -22,12 +22,7 @@ LOCAL_COPY_HEADERS := copybit.h copybit_priv.h c2d2.h
include $(BUILD_COPY_HEADERS)

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
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 @@ -45,12 +40,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_SHARED_LIBRARIES := $(common_libs) libqdutils libdl
Expand Down
7 changes: 1 addition & 6 deletions libhdmi/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 := libhdmi

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) liboverlay libqdutils
Expand Down
7 changes: 1 addition & 6 deletions libhwcomposer/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 := 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) $(kernel_includes) \
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 @@ -23,10 +23,6 @@ LOCAL_SHARED_LIBRARIES := liblog
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdlights\"
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_SHARED_LIBRARIES := liblog
Expand Down
7 changes: 1 addition & 6 deletions liboverlay/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 := liboverlay

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) libqdutils libmemalloc \
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) libui libbinder libqservice
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
Expand Down Expand Up @@ -48,12 +43,7 @@ LOCAL_CFLAGS := $(common_flags)
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 @@ -2,12 +2,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)

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 := $(call project-path-for,qcom-display)/sdm/include/ \
$(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
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 @@ -2,12 +2,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)

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 := $(call project-path-for,qcom-display)/sdm/include/ \
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 @@ -2,12 +2,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)

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 := $(call project-path-for,qcom-display)/sdm/include/
LOCAL_CFLAGS := -Wno-missing-field-initializers -Wno-unused-parameter \
Expand Down

0 comments on commit d1d9702

Please sign in to comment.