diff options
author | Naseer Ahmed <naseer@codeaurora.org> | 2017-03-01 18:48:00 -0500 |
---|---|---|
committer | Naseer Ahmed <naseer@codeaurora.org> | 2017-03-01 18:50:25 -0500 |
commit | 1e54952f4c5456dfefd9337b844148e2d61deacc (patch) | |
tree | 1f7b5d30526a0b628f0805335fff04796c0b24ec | |
parent | 4c790408b144b8ddf117a8d94661c81c86304cfc (diff) | |
download | display-1e54952f4c5456dfefd9337b844148e2d61deacc.tar.gz |
Revert "display: Move all opensource modules to vendor partition"
This reverts commit 4c790408b144b8ddf117a8d94661c81c86304cfc.
Change-Id: I32c48e300e8c641b196210c4412b635e1c1941f0
CRs-Fixed: 2013665
-rw-r--r-- | gpu_tonemapper/Android.mk | 6 | ||||
-rw-r--r-- | hdmi_cec/Android.mk | 1 | ||||
-rw-r--r-- | libcopybit/Android.mk | 2 | ||||
-rw-r--r-- | libdrmutils/Android.mk | 1 | ||||
-rw-r--r-- | libgralloc/Android.mk | 2 | ||||
-rw-r--r-- | libgralloc1/Android.mk | 1 | ||||
-rw-r--r-- | liblight/Android.mk | 1 | ||||
-rw-r--r-- | libmemtrack/Android.mk | 1 | ||||
-rw-r--r-- | libqdutils/Android.mk | 2 | ||||
-rw-r--r-- | libqservice/Android.mk | 1 | ||||
-rw-r--r-- | sdm/libs/core/Android.mk | 1 | ||||
-rw-r--r-- | sdm/libs/hwc/Android.mk | 1 | ||||
-rw-r--r-- | sdm/libs/hwc2/Android.mk | 1 | ||||
-rw-r--r-- | sdm/libs/utils/Android.mk | 1 |
14 files changed, 2 insertions, 20 deletions
diff --git a/gpu_tonemapper/Android.mk b/gpu_tonemapper/Android.mk index efd955f4..5d1f9a97 100644 --- a/gpu_tonemapper/Android.mk +++ b/gpu_tonemapper/Android.mk @@ -1,18 +1,16 @@ LOCAL_PATH := $(call my-dir) include $(LOCAL_PATH)/../common.mk - 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 LOCAL_MODULE_TAGS := optional -LOCAL_PROPRIETARY_MODULE := true 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 129bac9d..3b794e3c 100644 --- a/hdmi_cec/Android.mk +++ b/hdmi_cec/Android.mk @@ -3,7 +3,6 @@ include $(LOCAL_PATH)/../common.mk include $(CLEAR_VARS) LOCAL_MODULE := hdmi_cec.$(TARGET_BOARD_PLATFORM) -LOCAL_PROPRIETARY_MODULE := true 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 e3d66c07..3e6d8fee 100644 --- a/libcopybit/Android.mk +++ b/libcopybit/Android.mk @@ -22,9 +22,7 @@ LOCAL_COPY_HEADERS := copybit.h copybit_priv.h c2d2.h include $(BUILD_COPY_HEADERS) ifneq ($(TARGET_USES_GRALLOC1), true) -include $(CLEAR_VARS) LOCAL_MODULE := copybit.$(TARGET_BOARD_PLATFORM) -LOCAL_PROPRIETARY_MODULE := true 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 456a9de9..15102e4f 100644 --- a/libdrmutils/Android.mk +++ b/libdrmutils/Android.mk @@ -2,7 +2,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libdrmutils -LOCAL_PROPRIETARY_MODULE := true 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 21f4e5bd..6a0f868c 100644 --- a/libgralloc/Android.mk +++ b/libgralloc/Android.mk @@ -18,7 +18,6 @@ include $(LOCAL_PATH)/../common.mk include $(CLEAR_VARS) LOCAL_MODULE := gralloc.$(TARGET_BOARD_PLATFORM) -LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) @@ -38,7 +37,6 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := libmemalloc -LOCAL_PROPRIETARY_MODULE := true 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 77de9a1a..fb8c74a4 100644 --- a/libgralloc1/Android.mk +++ b/libgralloc1/Android.mk @@ -4,7 +4,6 @@ include $(LOCAL_PATH)/../common.mk include $(CLEAR_VARS) LOCAL_MODULE := gralloc.$(TARGET_BOARD_PLATFORM) -LOCAL_PROPRIETARY_MODULE := true 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 492b7986..ff4825ba 100644 --- a/liblight/Android.mk +++ b/liblight/Android.mk @@ -23,7 +23,6 @@ LOCAL_SHARED_LIBRARIES := liblog LOCAL_CFLAGS := -DLOG_TAG=\"qdlights\" LOCAL_CLANG := true LOCAL_MODULE := lights.$(TARGET_BOARD_PLATFORM) -LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) diff --git a/libmemtrack/Android.mk b/libmemtrack/Android.mk index d2f74840..4e7a09f8 100644 --- a/libmemtrack/Android.mk +++ b/libmemtrack/Android.mk @@ -19,7 +19,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_PROPRIETARY_MODULE := true 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 0b98202a..cc0b0133 100644 --- a/libqdutils/Android.mk +++ b/libqdutils/Android.mk @@ -3,7 +3,6 @@ include $(LOCAL_PATH)/../common.mk include $(CLEAR_VARS) LOCAL_MODULE := libqdutils -LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := $(common_libs) libbinder libqservice LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) @@ -29,6 +28,5 @@ LOCAL_CFLAGS += -DLOG_TAG=\"DisplayMetaData\" LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libqdMetaData -LOCAL_PROPRIETARY_MODULE := true include $(BUILD_SHARED_LIBRARY) diff --git a/libqservice/Android.mk b/libqservice/Android.mk index 113eb957..ea111804 100644 --- a/libqservice/Android.mk +++ b/libqservice/Android.mk @@ -3,7 +3,6 @@ include $(LOCAL_PATH)/../common.mk include $(CLEAR_VARS) LOCAL_MODULE := libqservice -LOCAL_PROPRIETARY_MODULE := true 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 424d6b46..cdf89256 100644 --- a/sdm/libs/core/Android.mk +++ b/sdm/libs/core/Android.mk @@ -3,7 +3,6 @@ include $(CLEAR_VARS) include $(LOCAL_PATH)/../../../common.mk LOCAL_MODULE := libsdmcore -LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) $(common_header_export_path) LOCAL_CFLAGS := -Wno-unused-parameter -DLOG_TAG=\"SDM\" \ diff --git a/sdm/libs/hwc/Android.mk b/sdm/libs/hwc/Android.mk index 60f84154..c39e1f90 100644 --- a/sdm/libs/hwc/Android.mk +++ b/sdm/libs/hwc/Android.mk @@ -4,7 +4,6 @@ include $(LOCAL_PATH)/../../../common.mk ifeq ($(use_hwc2),false) LOCAL_MODULE := hwcomposer.$(TARGET_BOARD_PLATFORM) -LOCAL_PROPRIETARY_MODULE := true 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 c63f7fef..d4ff53c0 100644 --- a/sdm/libs/hwc2/Android.mk +++ b/sdm/libs/hwc2/Android.mk @@ -5,7 +5,6 @@ include $(LOCAL_PATH)/../../../common.mk ifeq ($(use_hwc2),true) LOCAL_MODULE := hwcomposer.$(TARGET_BOARD_PLATFORM) -LOCAL_PROPRIETARY_MODULE := true 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 cfa194b8..f7f30a90 100644 --- a/sdm/libs/utils/Android.mk +++ b/sdm/libs/utils/Android.mk @@ -3,7 +3,6 @@ include $(CLEAR_VARS) include $(LOCAL_PATH)/../../../common.mk LOCAL_MODULE := libsdmutils -LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) LOCAL_CFLAGS := -DLOG_TAG=\"SDM\" $(common_flags) |