BOBtheBlinker/android_device_oneplus_dre
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sm8250-common: Relocate our custom HALs to vendor

Browse source 
* Adjust them for usage in /vendor while at it.

Change-Id: I84463a912d98e8af14ca31ffd8ac95db1aac916e
This commit is contained in:
LuK1337 2021-01-04 22:12:23 +01:00
parent 717bc37c5d
commit 1653e33e11
12 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common.mk
View file

@ -154,7 +154,7 @@ PRODUCT_PACKAGES += \
# Fingerprint # Fingerprint
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hardware.biometrics.fingerprint@2.1-service.oneplus_kona \ 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.fingerprint.extension@1.0 \
vendor.oneplus.hardware.display@1.0 vendor.oneplus.hardware.display@1.0
@ -169,7 +169,7 @@ PRODUCT_COPY_FILES += \
# LiveDisplay # LiveDisplay
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
lineage.livedisplay@2.0-service.oneplus_kona vendor.lineage.livedisplay@2.0-service.oneplus_kona
# Media # Media
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
@ -207,7 +207,7 @@ PRODUCT_PACKAGES += \
# PowerShare # PowerShare
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
lineage.powershare@1.0-service.oneplus_kona vendor.lineage.powershare@1.0-service.oneplus_kona
# Ramdisk # Ramdisk
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
@ -240,7 +240,7 @@ PRODUCT_COPY_FILES += \
# Touch # Touch
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
lineage.touch@1.0-service.oneplus_kona vendor.lineage.touch@1.0-service.oneplus_kona
# tri-state-key # tri-state-key
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \

5
fod/Android.bp
View file

@ -16,8 +16,8 @@
oneplus_kona_fod_hal_binary { oneplus_kona_fod_hal_binary {
relative_install_path: "hw", relative_install_path: "hw",
defaults: ["hidl_defaults"], defaults: ["hidl_defaults"],
name: "lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona", name: "vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona",
init_rc: ["lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.rc"], init_rc: ["vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.rc"],
srcs: ["service.cpp", "FingerprintInscreen.cpp"], srcs: ["service.cpp", "FingerprintInscreen.cpp"],
shared_libs: [ shared_libs: [
"libbase", "libbase",
@ -29,6 +29,7 @@ oneplus_kona_fod_hal_binary {
"//device/oneplus/common:vendor.oneplus.fingerprint.extension@1.0", "//device/oneplus/common:vendor.oneplus.fingerprint.extension@1.0",
"//device/oneplus/common:vendor.oneplus.hardware.display@1.0", "//device/oneplus/common:vendor.oneplus.hardware.display@1.0",
], ],
proprietary: true,
} }
cc_library_static { cc_library_static {

2
fod/lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.rc → fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.rc
View file

@ -2,7 +2,7 @@ on init
chown system system /sys/class/drm/card0-DSI-1/op_friginer_print_hbm 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 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 interface vendor.lineage.biometrics.fingerprint.inscreen@1.0::IFingerprintInscreen default
class hal class hal
user system user system

6
livedisplay/Android.bp
View file

@ -14,8 +14,8 @@
// limitations under the License. // limitations under the License.
cc_binary { cc_binary {
name: "lineage.livedisplay@2.0-service.oneplus_kona", name: "vendor.lineage.livedisplay@2.0-service.oneplus_kona",
init_rc: ["lineage.livedisplay@2.0-service.oneplus_kona.rc"], init_rc: ["vendor.lineage.livedisplay@2.0-service.oneplus_kona.rc"],
defaults: ["hidl_defaults"], defaults: ["hidl_defaults"],
relative_install_path: "hw", relative_install_path: "hw",
srcs: [ srcs: [
@ -35,5 +35,5 @@ cc_binary {
header_libs: [ header_libs: [
"vendor.lineage.livedisplay@2.0-sdm-headers", "vendor.lineage.livedisplay@2.0-sdm-headers",
], ],
cflags: ["-DLIVES_IN_SYSTEM"], proprietary: true,
} }

4
livedisplay/DisplayModes.cpp
View file

@ -29,9 +29,9 @@ namespace livedisplay {
namespace V2_0 { namespace V2_0 {
namespace implementation { 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 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<int32_t, DisplayModes::ModeInfo> DisplayModes::kModeMap = { const std::map<int32_t, DisplayModes::ModeInfo> DisplayModes::kModeMap = {
{0, {"Standard", "default"}}, {0, {"Standard", "default"}},

2
livedisplay/service.cpp
View file

@ -41,7 +41,7 @@ using ::vendor::lineage::livedisplay::V2_0::sdm::SDMController;
int main() { int main() {
status_t status = OK; status_t status = OK;
android::ProcessState::initWithDriver("/dev/binder"); android::ProcessState::initWithDriver("/dev/vndbinder");
LOG(INFO) << "LiveDisplay HAL service is starting."; LOG(INFO) << "LiveDisplay HAL service is starting.";

5
livedisplay/lineage.livedisplay@2.0-service.oneplus_kona.rc → livedisplay/vendor.lineage.livedisplay@2.0-service.oneplus_kona.rc
View file

@ -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_srgb_color_mode
chmod 0666 /sys/class/drm/card0-DSI-1/native_display_wide_color_mode chmod 0666 /sys/class/drm/card0-DSI-1/native_display_wide_color_mode
on post-fs-data service vendor.livedisplay-hal-2-0 /vendor/bin/hw/vendor.lineage.livedisplay@2.0-service.oneplus_kona
mkdir /data/misc/display 0770 system graphics
service livedisplay-hal-2-0 /system/bin/hw/lineage.livedisplay@2.0-service.oneplus_kona
class hal class hal
user system user system
group system group system

5
powershare/Android.bp
View file

@ -16,8 +16,8 @@
cc_binary { cc_binary {
relative_install_path: "hw", relative_install_path: "hw",
defaults: ["hidl_defaults"], defaults: ["hidl_defaults"],
name: "lineage.powershare@1.0-service.oneplus_kona", name: "vendor.lineage.powershare@1.0-service.oneplus_kona",
init_rc: ["lineage.powershare@1.0-service.oneplus_kona.rc"], init_rc: ["vendor.lineage.powershare@1.0-service.oneplus_kona.rc"],
srcs: ["service.cpp", "PowerShare.cpp"], srcs: ["service.cpp", "PowerShare.cpp"],
shared_libs: [ shared_libs: [
"libbase", "libbase",
@ -27,4 +27,5 @@ cc_binary {
"libutils", "libutils",
"vendor.lineage.powershare@1.0", "vendor.lineage.powershare@1.0",
], ],
proprietary: true,
} }

4
powershare/lineage.powershare@1.0-service.oneplus_kona.rc
View file

@ -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

4
powershare/vendor.lineage.powershare@1.0-service.oneplus_kona.rc Normal file
View file

@ -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

5
touch/Android.bp
View file

@ -14,8 +14,8 @@
// limitations under the License. // limitations under the License.
cc_binary { cc_binary {
name: "lineage.touch@1.0-service.oneplus_kona", name: "vendor.lineage.touch@1.0-service.oneplus_kona",
init_rc: ["lineage.touch@1.0-service.oneplus_kona.rc"], init_rc: ["vendor.lineage.touch@1.0-service.oneplus_kona.rc"],
defaults: ["hidl_defaults"], defaults: ["hidl_defaults"],
relative_install_path: "hw", relative_install_path: "hw",
srcs: [ srcs: [
@ -29,4 +29,5 @@ cc_binary {
"libutils", "libutils",
"vendor.lineage.touch@1.0", "vendor.lineage.touch@1.0",
], ],
proprietary: true,
} }

2
touch/lineage.touch@1.0-service.oneplus_kona.rc → touch/vendor.lineage.touch@1.0-service.oneplus_kona.rc
View file

@ -28,7 +28,7 @@ on boot
chown system system /proc/touchpanel/up_swipe_enable chown system system /proc/touchpanel/up_swipe_enable
chown system system /proc/touchpanel/single_tap_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 class hal
user system user system
group system group system