universal7885: Organize configs, add shim for hwcomposer

Signed-off-by: roynatech2544 <whiteshell2544@naver.com>

universal7885-common/BoardConfigCommon.mk

@@ -58,7 +58,7 @@ TARGET_KERNEL_CLANG_COMPILE := true
 TARGET_KEYMASTER_VARIANT := samsung
 
 # HIDL
-include device/samsung/universal7885-common/vintf/manifest.mk
+include device/samsung/universal7885-common/configs/vintf/manifest.mk
 
 # LMKD stats logging
 TARGET_LMKD_STATS_LOG := true
@@ -71,7 +71,7 @@ BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_FLASH_BLOCK_SIZE := 131072
 
 # Properties
-include device/samsung/universal7885-common/props/props.mk
+include device/samsung/universal7885-common/configs/props/props.mk
 
 # Recovery
 BOARD_HAS_DOWNLOAD_MODE := true

universal7885-common/configs/props/props.mk

@@ -1,4 +1,4 @@
-PROPS_PATH := device/samsung/universal7885-common/props
+PROPS_PATH := device/samsung/universal7885-common/configs/props
 
 BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
 TARGET_PRODUCT_PROP += $(PROPS_PATH)/product.prop

universal7885-common/configs/vintf/manifest.mk

@@ -1,4 +1,4 @@
-MANIFEST_PATH := device/samsung/universal7885-common/vintf
+MANIFEST_PATH := device/samsung/universal7885-common/configs/vintf
 
 DEVICE_MANIFEST_FILE := $(MANIFEST_PATH)/manifest.xml
 DEVICE_MATRIX_FILE := $(MANIFEST_PATH)/compatibility_matrix.xml

universal7885-common/libshims/camera/Android.bp

@@ -1,23 +1,3 @@
-cc_library_shared {
-    name: "libshim_sensorndkbridge",
-
-    srcs: ["ASensorManager.cpp"],
-    shared_libs: [
-        "liblog",
-        "libsensorndkbridge",
-        "libutils",
-    ],
-    whole_static_libs: ["libbase"],
-    header_libs: ["libbase_headers"],
-    vendor: true,
-
-    include_dirs: [
-        "system/core/libutils/include",
-        "frameworks/hardware/interfaces/sensorservice/libsensorndkbridge",
-    ],
-
-}
-
 cc_library_shared {
     name: "libcamera_metadata_helper",
     proprietary: true,

universal7885-common/libshims/hwcomposer/Android.bp

@@ -0,0 +1,27 @@
+// board_platform must match TARGET_BOARD_PLATFORM
+board_platform = "universal7884B"
+cmd_and = " && "
+
+hwc = "hwcomposer." + board_platform
+hwcomposer = "$(productOut)/vendor/lib64/hw/" + hwc + ".so"
+
+original_symbol = "_Z27exynos_acceptDisplayChangesP11hwc2_devicem"
+custom_symbol = "_Z27exynos_acceptDisplayChangesP12hwc2_devicem"
+
+
+cc_library_shared {
+    name: "libhwcomposer_shim",
+    srcs: [
+        "hwcomposer_shim.cpp"
+    ],
+    required: ["libhwccomposer-patch"],
+    vendor: true,
+}
+
+7884B_build_command {
+    name: "libhwccomposer-patch",
+    cmd: "mkdir -p $(productOut)/vendor/lib64/hw" + cmd_and +
+         "sed -i s/" + original_symbol + "/" + custom_symbol + "/g " + hwcomposer + cmd_and +
+         "patchelf --add-needed libhwcomposer_shim.so" + hwcomposer,
+    required: [hwcomposer],
+}

universal7885-common/libshims/hwcomposer/hwcomposer_shim.cpp

@@ -0,0 +1,2 @@
+#include <hwcomposer2.h>
+extern "C" void _Z27exynos_acceptDisplayChangesP12hwc2_devicem(hwc2_device*, unsigned long) {}

universal7885-common/libshims/sensor/Android.bp

@@ -0,0 +1,19 @@
+cc_library_shared {
+    name: "libshim_sensorndkbridge",
+
+    srcs: ["ASensorManager.cpp"],
+    shared_libs: [
+        "liblog",
+        "libsensorndkbridge",
+        "libutils",
+    ],
+    whole_static_libs: ["libbase"],
+    header_libs: ["libbase_headers"],
+    vendor: true,
+
+    include_dirs: [
+        "system/core/libutils/include",
+        "frameworks/hardware/interfaces/sensorservice/libsensorndkbridge",
+    ],
+
+}