diff options
-rw-r--r-- | gpu_tonemapper/Android.mk | 11 | ||||
-rw-r--r-- | hdmi_cec/Android.mk | 6 | ||||
-rw-r--r-- | libcopybit/Android.mk | 7 | ||||
-rw-r--r-- | libdrmutils/Android.mk | 6 | ||||
-rw-r--r-- | libgralloc/Android.mk | 12 | ||||
-rw-r--r-- | libgralloc1/Android.mk | 6 | ||||
-rw-r--r-- | liblight/Android.mk | 5 | ||||
-rw-r--r-- | libmemtrack/Android.mk | 6 | ||||
-rw-r--r-- | libqdutils/Android.mk | 12 | ||||
-rw-r--r-- | libqservice/Android.mk | 6 | ||||
-rw-r--r-- | sdm/libs/core/Android.mk | 6 | ||||
-rw-r--r-- | sdm/libs/hwc/Android.mk | 6 | ||||
-rw-r--r-- | sdm/libs/hwc2/Android.mk | 6 | ||||
-rw-r--r-- | sdm/libs/utils/Android.mk | 6 |
14 files changed, 99 insertions, 2 deletions
diff --git a/gpu_tonemapper/Android.mk b/gpu_tonemapper/Android.mk index 5d1f9a97..2d10319f 100644 --- a/gpu_tonemapper/Android.mk +++ b/gpu_tonemapper/Android.mk @@ -1,16 +1,23 @@ LOCAL_PATH := $(call my-dir) include $(LOCAL_PATH)/../common.mk -include $(CLEAR_VARS) +include $(CLEAR_VARS) LOCAL_COPY_HEADERS_TO := $(common_header_export_path) LOCAL_COPY_HEADERS := TonemapFactory.h Tonemapper.h -LOCAL_SHARED_LIBRARIES := libEGL libGLESv2 libui libutils liblog 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_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(TARGET_OUT_HEADERS)/qcom/display/ LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include +LOCAL_SHARED_LIBRARIES := libEGL libGLESv2 libui libutils liblog LOCAL_CFLAGS := $(version_flag) -Wno-missing-field-initializers -Wall \ -Wno-unused-parameter -std=c++11 -DLOG_TAG=\"GPU_TONEMAPPER\" diff --git a/hdmi_cec/Android.mk b/hdmi_cec/Android.mk index 6539933f..6cfb856a 100644 --- a/hdmi_cec/Android.mk +++ b/hdmi_cec/Android.mk @@ -3,6 +3,12 @@ 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_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) diff --git a/libcopybit/Android.mk b/libcopybit/Android.mk index 3e6d8fee..0bce6027 100644 --- a/libcopybit/Android.mk +++ b/libcopybit/Android.mk @@ -21,8 +21,15 @@ LOCAL_COPY_HEADERS := copybit.h copybit_priv.h c2d2.h #Copy the headers regardless of whether copybit is built 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_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) diff --git a/libdrmutils/Android.mk b/libdrmutils/Android.mk index 15102e4f..36beea22 100644 --- a/libdrmutils/Android.mk +++ b/libdrmutils/Android.mk @@ -2,6 +2,12 @@ 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_MODULE_TAGS := optional LOCAL_C_INCLUDES := external/libdrm \ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include diff --git a/libgralloc/Android.mk b/libgralloc/Android.mk index 6a0f868c..8d5dfd37 100644 --- a/libgralloc/Android.mk +++ b/libgralloc/Android.mk @@ -18,6 +18,12 @@ 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_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) @@ -37,6 +43,12 @@ 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_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) libqdutils libdl diff --git a/libgralloc1/Android.mk b/libgralloc1/Android.mk index 6bbbda46..0afe5f9b 100644 --- a/libgralloc1/Android.mk +++ b/libgralloc1/Android.mk @@ -4,6 +4,12 @@ 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_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) \ diff --git a/liblight/Android.mk b/liblight/Android.mk index aa09187a..1fa05f7b 100644 --- a/liblight/Android.mk +++ b/liblight/Android.mk @@ -28,4 +28,9 @@ 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 + include $(BUILD_SHARED_LIBRARY) diff --git a/libmemtrack/Android.mk b/libmemtrack/Android.mk index 4e7a09f8..12475c37 100644 --- a/libmemtrack/Android.mk +++ b/libmemtrack/Android.mk @@ -19,6 +19,12 @@ 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_C_INCLUDES += hardware/libhardware/include LOCAL_CFLAGS := -Wconversion -Wall -Werror -Wno-sign-conversion LOCAL_CLANG := true diff --git a/libqdutils/Android.mk b/libqdutils/Android.mk index fb8a776c..c7f428be 100644 --- a/libqdutils/Android.mk +++ b/libqdutils/Android.mk @@ -3,6 +3,12 @@ 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_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := $(common_libs) libbinder libqservice LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) @@ -30,5 +36,11 @@ 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 + include $(BUILD_SHARED_LIBRARY) diff --git a/libqservice/Android.mk b/libqservice/Android.mk index ea111804..0f77d4fe 100644 --- a/libqservice/Android.mk +++ b/libqservice/Android.mk @@ -3,6 +3,12 @@ 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_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) libbinder diff --git a/sdm/libs/core/Android.mk b/sdm/libs/core/Android.mk index abdd9588..874b1503 100644 --- a/sdm/libs/core/Android.mk +++ b/sdm/libs/core/Android.mk @@ -3,6 +3,12 @@ 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_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) LOCAL_HEADER_LIBRARIES := display_headers diff --git a/sdm/libs/hwc/Android.mk b/sdm/libs/hwc/Android.mk index 9c78cd33..049f0f97 100644 --- a/sdm/libs/hwc/Android.mk +++ b/sdm/libs/hwc/Android.mk @@ -4,6 +4,12 @@ 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_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) diff --git a/sdm/libs/hwc2/Android.mk b/sdm/libs/hwc2/Android.mk index aeb2558a..1dec6be3 100644 --- a/sdm/libs/hwc2/Android.mk +++ b/sdm/libs/hwc2/Android.mk @@ -5,6 +5,12 @@ 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_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) diff --git a/sdm/libs/utils/Android.mk b/sdm/libs/utils/Android.mk index 9b7f531e..36d1148b 100644 --- a/sdm/libs/utils/Android.mk +++ b/sdm/libs/utils/Android.mk @@ -3,6 +3,12 @@ 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_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) LOCAL_HEADER_LIBRARIES := display_headers |