From 1653e33e11f1b56cfd15e039c96be1b39627ae11 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Mon, 4 Jan 2021 22:12:23 +0100 Subject: [PATCH] sm8250-common: Relocate our custom HALs to vendor * Adjust them for usage in /vendor while at it. Change-Id: I84463a912d98e8af14ca31ffd8ac95db1aac916e --- common.mk | 8 ++++---- fod/Android.bp | 5 +++-- ...rics.fingerprint.inscreen@1.0-service.oneplus_kona.rc} | 2 +- livedisplay/Android.bp | 6 +++--- livedisplay/DisplayModes.cpp | 4 ++-- livedisplay/service.cpp | 2 +- ...endor.lineage.livedisplay@2.0-service.oneplus_kona.rc} | 5 +---- powershare/Android.bp | 5 +++-- powershare/lineage.powershare@1.0-service.oneplus_kona.rc | 4 ---- .../vendor.lineage.powershare@1.0-service.oneplus_kona.rc | 4 ++++ touch/Android.bp | 5 +++-- ...c => vendor.lineage.touch@1.0-service.oneplus_kona.rc} | 2 +- 12 files changed, 26 insertions(+), 26 deletions(-) rename fod/{lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.rc => vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.rc} (70%) rename livedisplay/{lineage.livedisplay@2.0-service.oneplus_kona.rc => vendor.lineage.livedisplay@2.0-service.oneplus_kona.rc} (90%) delete mode 100644 powershare/lineage.powershare@1.0-service.oneplus_kona.rc create mode 100644 powershare/vendor.lineage.powershare@1.0-service.oneplus_kona.rc rename touch/{lineage.touch@1.0-service.oneplus_kona.rc => vendor.lineage.touch@1.0-service.oneplus_kona.rc} (94%) diff --git a/common.mk b/common.mk index 70f5448..524800a 100644 --- a/common.mk +++ b/common.mk @@ -154,7 +154,7 @@ PRODUCT_PACKAGES += \ # Fingerprint PRODUCT_PACKAGES += \ android.hardware.biometrics.fingerprint@2.1-service.oneplus_kona \ - lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona \ + vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona \ vendor.oneplus.fingerprint.extension@1.0 \ vendor.oneplus.hardware.display@1.0 @@ -169,7 +169,7 @@ PRODUCT_COPY_FILES += \ # LiveDisplay PRODUCT_PACKAGES += \ - lineage.livedisplay@2.0-service.oneplus_kona + vendor.lineage.livedisplay@2.0-service.oneplus_kona # Media PRODUCT_COPY_FILES += \ @@ -207,7 +207,7 @@ PRODUCT_PACKAGES += \ # PowerShare PRODUCT_PACKAGES += \ - lineage.powershare@1.0-service.oneplus_kona + vendor.lineage.powershare@1.0-service.oneplus_kona # Ramdisk PRODUCT_COPY_FILES += \ @@ -240,7 +240,7 @@ PRODUCT_COPY_FILES += \ # Touch PRODUCT_PACKAGES += \ - lineage.touch@1.0-service.oneplus_kona + vendor.lineage.touch@1.0-service.oneplus_kona # tri-state-key PRODUCT_PACKAGES += \ diff --git a/fod/Android.bp b/fod/Android.bp index 350643b..d178650 100644 --- a/fod/Android.bp +++ b/fod/Android.bp @@ -16,8 +16,8 @@ oneplus_kona_fod_hal_binary { relative_install_path: "hw", defaults: ["hidl_defaults"], - name: "lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona", - init_rc: ["lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.rc"], + name: "vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona", + init_rc: ["vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.rc"], srcs: ["service.cpp", "FingerprintInscreen.cpp"], shared_libs: [ "libbase", @@ -29,6 +29,7 @@ oneplus_kona_fod_hal_binary { "//device/oneplus/common:vendor.oneplus.fingerprint.extension@1.0", "//device/oneplus/common:vendor.oneplus.hardware.display@1.0", ], + proprietary: true, } cc_library_static { diff --git a/fod/lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.rc b/fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.rc similarity index 70% rename from fod/lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.rc rename to fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.rc index c1d05fb..85ff7e5 100644 --- a/fod/lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.rc +++ b/fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.rc @@ -2,7 +2,7 @@ on init chown system system /sys/class/drm/card0-DSI-1/op_friginer_print_hbm chmod 0660 /sys/class/drm/card0-DSI-1/op_friginer_print_hbm -service fingerprint-inscreen-1-0 /system/bin/hw/lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona +service vendor.fingerprint-inscreen-1-0 /vendor/bin/hw/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona interface vendor.lineage.biometrics.fingerprint.inscreen@1.0::IFingerprintInscreen default class hal user system diff --git a/livedisplay/Android.bp b/livedisplay/Android.bp index 29dd4e4..467c164 100644 --- a/livedisplay/Android.bp +++ b/livedisplay/Android.bp @@ -14,8 +14,8 @@ // limitations under the License. cc_binary { - name: "lineage.livedisplay@2.0-service.oneplus_kona", - init_rc: ["lineage.livedisplay@2.0-service.oneplus_kona.rc"], + name: "vendor.lineage.livedisplay@2.0-service.oneplus_kona", + init_rc: ["vendor.lineage.livedisplay@2.0-service.oneplus_kona.rc"], defaults: ["hidl_defaults"], relative_install_path: "hw", srcs: [ @@ -35,5 +35,5 @@ cc_binary { header_libs: [ "vendor.lineage.livedisplay@2.0-sdm-headers", ], - cflags: ["-DLIVES_IN_SYSTEM"], + proprietary: true, } diff --git a/livedisplay/DisplayModes.cpp b/livedisplay/DisplayModes.cpp index 76bcab3..b95eec4 100644 --- a/livedisplay/DisplayModes.cpp +++ b/livedisplay/DisplayModes.cpp @@ -29,9 +29,9 @@ namespace livedisplay { namespace V2_0 { namespace implementation { -static constexpr const char* kDisplayModeProp = "sys.display.mode"; +static constexpr const char* kDisplayModeProp = "vendor.display.mode"; static const std::string kModeBasePath = "/sys/class/drm/card0-DSI-1/"; -static const std::string kDefaultPath = "/data/misc/display/default_display_mode"; +static const std::string kDefaultPath = "/data/vendor/display/default_display_mode"; const std::map DisplayModes::kModeMap = { {0, {"Standard", "default"}}, diff --git a/livedisplay/service.cpp b/livedisplay/service.cpp index d040c88..cfb9333 100644 --- a/livedisplay/service.cpp +++ b/livedisplay/service.cpp @@ -41,7 +41,7 @@ using ::vendor::lineage::livedisplay::V2_0::sdm::SDMController; int main() { status_t status = OK; - android::ProcessState::initWithDriver("/dev/binder"); + android::ProcessState::initWithDriver("/dev/vndbinder"); LOG(INFO) << "LiveDisplay HAL service is starting."; diff --git a/livedisplay/lineage.livedisplay@2.0-service.oneplus_kona.rc b/livedisplay/vendor.lineage.livedisplay@2.0-service.oneplus_kona.rc similarity index 90% rename from livedisplay/lineage.livedisplay@2.0-service.oneplus_kona.rc rename to livedisplay/vendor.lineage.livedisplay@2.0-service.oneplus_kona.rc index fc86892..a15c4e1 100644 --- a/livedisplay/lineage.livedisplay@2.0-service.oneplus_kona.rc +++ b/livedisplay/vendor.lineage.livedisplay@2.0-service.oneplus_kona.rc @@ -14,10 +14,7 @@ on init chmod 0666 /sys/class/drm/card0-DSI-1/native_display_srgb_color_mode chmod 0666 /sys/class/drm/card0-DSI-1/native_display_wide_color_mode -on post-fs-data - mkdir /data/misc/display 0770 system graphics - -service livedisplay-hal-2-0 /system/bin/hw/lineage.livedisplay@2.0-service.oneplus_kona +service vendor.livedisplay-hal-2-0 /vendor/bin/hw/vendor.lineage.livedisplay@2.0-service.oneplus_kona class hal user system group system diff --git a/powershare/Android.bp b/powershare/Android.bp index 68b03d0..de07fe0 100644 --- a/powershare/Android.bp +++ b/powershare/Android.bp @@ -16,8 +16,8 @@ cc_binary { relative_install_path: "hw", defaults: ["hidl_defaults"], - name: "lineage.powershare@1.0-service.oneplus_kona", - init_rc: ["lineage.powershare@1.0-service.oneplus_kona.rc"], + name: "vendor.lineage.powershare@1.0-service.oneplus_kona", + init_rc: ["vendor.lineage.powershare@1.0-service.oneplus_kona.rc"], srcs: ["service.cpp", "PowerShare.cpp"], shared_libs: [ "libbase", @@ -27,4 +27,5 @@ cc_binary { "libutils", "vendor.lineage.powershare@1.0", ], + proprietary: true, } diff --git a/powershare/lineage.powershare@1.0-service.oneplus_kona.rc b/powershare/lineage.powershare@1.0-service.oneplus_kona.rc deleted file mode 100644 index b5f8808..0000000 --- a/powershare/lineage.powershare@1.0-service.oneplus_kona.rc +++ /dev/null @@ -1,4 +0,0 @@ -service powershare-hal-1-0 /system/bin/hw/lineage.powershare@1.0-service.oneplus_kona - class hal - user system - group system diff --git a/powershare/vendor.lineage.powershare@1.0-service.oneplus_kona.rc b/powershare/vendor.lineage.powershare@1.0-service.oneplus_kona.rc new file mode 100644 index 0000000..caf28b1 --- /dev/null +++ b/powershare/vendor.lineage.powershare@1.0-service.oneplus_kona.rc @@ -0,0 +1,4 @@ +service vendor.powershare-hal-1-0 /vendor/bin/hw/vendor.lineage.powershare@1.0-service.oneplus_kona + class hal + user system + group system diff --git a/touch/Android.bp b/touch/Android.bp index ead880a..2c8bff8 100644 --- a/touch/Android.bp +++ b/touch/Android.bp @@ -14,8 +14,8 @@ // limitations under the License. cc_binary { - name: "lineage.touch@1.0-service.oneplus_kona", - init_rc: ["lineage.touch@1.0-service.oneplus_kona.rc"], + name: "vendor.lineage.touch@1.0-service.oneplus_kona", + init_rc: ["vendor.lineage.touch@1.0-service.oneplus_kona.rc"], defaults: ["hidl_defaults"], relative_install_path: "hw", srcs: [ @@ -29,4 +29,5 @@ cc_binary { "libutils", "vendor.lineage.touch@1.0", ], + proprietary: true, } diff --git a/touch/lineage.touch@1.0-service.oneplus_kona.rc b/touch/vendor.lineage.touch@1.0-service.oneplus_kona.rc similarity index 94% rename from touch/lineage.touch@1.0-service.oneplus_kona.rc rename to touch/vendor.lineage.touch@1.0-service.oneplus_kona.rc index 6cd3068..ebe3f5d 100644 --- a/touch/lineage.touch@1.0-service.oneplus_kona.rc +++ b/touch/vendor.lineage.touch@1.0-service.oneplus_kona.rc @@ -28,7 +28,7 @@ on boot chown system system /proc/touchpanel/up_swipe_enable chown system system /proc/touchpanel/single_tap_enable -service touch-hal-1-0 /system/bin/hw/lineage.touch@1.0-service.oneplus_kona +service vendor.touch-hal-1-0 /vendor/bin/hw/vendor.lineage.touch@1.0-service.oneplus_kona class hal user system group system