From ece023aaed3539ffcfc5d4ee1a3f938174d6ffb8 Mon Sep 17 00:00:00 2001 From: roynatech2544 Date: Sat, 20 Nov 2021 21:56:34 +0900 Subject: [PATCH] universal7885: Organize configs, add shim for hwcomposer Signed-off-by: roynatech2544 --- universal7885-common/BoardConfigCommon.mk | 4 +-- .../{ => configs}/props/product.prop | 0 .../{ => configs}/props/props.mk | 2 +- .../{ => configs}/props/vendor.prop | 0 .../vintf/compatibility_matrix.xml | 0 .../{ => configs}/vintf/manifest.mk | 2 +- .../{ => configs}/vintf/manifest.xml | 0 .../{ => configs}/vintf/manifest_nfc.xml | 0 .../libshims/{ => camera}/Android.bp | 20 -------------- .../libshims/{ => camera}/CameraMetadata.cpp | 0 .../libshims/{ => camera}/CameraMetadata.h | 0 .../{ => camera}/CameraParameters.cpp | 0 .../libshims/{ => camera}/CameraParameters.h | 0 .../libshims/hwcomposer/Android.bp | 27 +++++++++++++++++++ .../libshims/hwcomposer/hwcomposer_shim.cpp | 2 ++ .../libshims/{ => sensor}/ASensorManager.cpp | 0 .../libshims/sensor/Android.bp | 19 +++++++++++++ 17 files changed, 52 insertions(+), 24 deletions(-) rename universal7885-common/{ => configs}/props/product.prop (100%) rename universal7885-common/{ => configs}/props/props.mk (69%) rename universal7885-common/{ => configs}/props/vendor.prop (100%) rename universal7885-common/{ => configs}/vintf/compatibility_matrix.xml (100%) rename universal7885-common/{ => configs}/vintf/manifest.mk (75%) rename universal7885-common/{ => configs}/vintf/manifest.xml (100%) rename universal7885-common/{ => configs}/vintf/manifest_nfc.xml (100%) rename universal7885-common/libshims/{ => camera}/Android.bp (51%) rename universal7885-common/libshims/{ => camera}/CameraMetadata.cpp (100%) rename universal7885-common/libshims/{ => camera}/CameraMetadata.h (100%) rename universal7885-common/libshims/{ => camera}/CameraParameters.cpp (100%) rename universal7885-common/libshims/{ => camera}/CameraParameters.h (100%) create mode 100644 universal7885-common/libshims/hwcomposer/Android.bp create mode 100644 universal7885-common/libshims/hwcomposer/hwcomposer_shim.cpp rename universal7885-common/libshims/{ => sensor}/ASensorManager.cpp (100%) create mode 100644 universal7885-common/libshims/sensor/Android.bp diff --git a/universal7885-common/BoardConfigCommon.mk b/universal7885-common/BoardConfigCommon.mk index a0747f2..21c948a 100644 --- a/universal7885-common/BoardConfigCommon.mk +++ b/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 diff --git a/universal7885-common/props/product.prop b/universal7885-common/configs/props/product.prop similarity index 100% rename from universal7885-common/props/product.prop rename to universal7885-common/configs/props/product.prop diff --git a/universal7885-common/props/props.mk b/universal7885-common/configs/props/props.mk similarity index 69% rename from universal7885-common/props/props.mk rename to universal7885-common/configs/props/props.mk index 6514f17..15d524a 100644 --- a/universal7885-common/props/props.mk +++ b/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 diff --git a/universal7885-common/props/vendor.prop b/universal7885-common/configs/props/vendor.prop similarity index 100% rename from universal7885-common/props/vendor.prop rename to universal7885-common/configs/props/vendor.prop diff --git a/universal7885-common/vintf/compatibility_matrix.xml b/universal7885-common/configs/vintf/compatibility_matrix.xml similarity index 100% rename from universal7885-common/vintf/compatibility_matrix.xml rename to universal7885-common/configs/vintf/compatibility_matrix.xml diff --git a/universal7885-common/vintf/manifest.mk b/universal7885-common/configs/vintf/manifest.mk similarity index 75% rename from universal7885-common/vintf/manifest.mk rename to universal7885-common/configs/vintf/manifest.mk index ecf6223..9ce912c 100644 --- a/universal7885-common/vintf/manifest.mk +++ b/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 diff --git a/universal7885-common/vintf/manifest.xml b/universal7885-common/configs/vintf/manifest.xml similarity index 100% rename from universal7885-common/vintf/manifest.xml rename to universal7885-common/configs/vintf/manifest.xml diff --git a/universal7885-common/vintf/manifest_nfc.xml b/universal7885-common/configs/vintf/manifest_nfc.xml similarity index 100% rename from universal7885-common/vintf/manifest_nfc.xml rename to universal7885-common/configs/vintf/manifest_nfc.xml diff --git a/universal7885-common/libshims/Android.bp b/universal7885-common/libshims/camera/Android.bp similarity index 51% rename from universal7885-common/libshims/Android.bp rename to universal7885-common/libshims/camera/Android.bp index 454c180..aad3b3c 100644 --- a/universal7885-common/libshims/Android.bp +++ b/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, diff --git a/universal7885-common/libshims/CameraMetadata.cpp b/universal7885-common/libshims/camera/CameraMetadata.cpp similarity index 100% rename from universal7885-common/libshims/CameraMetadata.cpp rename to universal7885-common/libshims/camera/CameraMetadata.cpp diff --git a/universal7885-common/libshims/CameraMetadata.h b/universal7885-common/libshims/camera/CameraMetadata.h similarity index 100% rename from universal7885-common/libshims/CameraMetadata.h rename to universal7885-common/libshims/camera/CameraMetadata.h diff --git a/universal7885-common/libshims/CameraParameters.cpp b/universal7885-common/libshims/camera/CameraParameters.cpp similarity index 100% rename from universal7885-common/libshims/CameraParameters.cpp rename to universal7885-common/libshims/camera/CameraParameters.cpp diff --git a/universal7885-common/libshims/CameraParameters.h b/universal7885-common/libshims/camera/CameraParameters.h similarity index 100% rename from universal7885-common/libshims/CameraParameters.h rename to universal7885-common/libshims/camera/CameraParameters.h diff --git a/universal7885-common/libshims/hwcomposer/Android.bp b/universal7885-common/libshims/hwcomposer/Android.bp new file mode 100644 index 0000000..824a0f1 --- /dev/null +++ b/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], +} diff --git a/universal7885-common/libshims/hwcomposer/hwcomposer_shim.cpp b/universal7885-common/libshims/hwcomposer/hwcomposer_shim.cpp new file mode 100644 index 0000000..c707ab9 --- /dev/null +++ b/universal7885-common/libshims/hwcomposer/hwcomposer_shim.cpp @@ -0,0 +1,2 @@ +#include +extern "C" void _Z27exynos_acceptDisplayChangesP12hwc2_devicem(hwc2_device*, unsigned long) {} diff --git a/universal7885-common/libshims/ASensorManager.cpp b/universal7885-common/libshims/sensor/ASensorManager.cpp similarity index 100% rename from universal7885-common/libshims/ASensorManager.cpp rename to universal7885-common/libshims/sensor/ASensorManager.cpp diff --git a/universal7885-common/libshims/sensor/Android.bp b/universal7885-common/libshims/sensor/Android.bp new file mode 100644 index 0000000..5742ccc --- /dev/null +++ b/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", + ], + +}