From 21d97dee66be1bba05de14b56fefaedbf69a4b15 Mon Sep 17 00:00:00 2001 From: ManshuTyagi Date: Wed, 4 May 2022 04:10:02 +0530 Subject: [PATCH] RMX3031: Changes for vendor Signed-off-by: ManshuTyagi Change-Id: Iaa65461f03b61d50209f095969a55b37a9a9190a --- device.mk | 11 +++---- fingerprint/Android.bp | 1 + ...metrics.fingerprint@2.3-service.RMX3031.rc | 2 +- ...etrics.fingerprint@2.3-service.RMX3031.xml | 2 +- lights/Android.bp | 32 +++++++++++++++++++ lights/Android.mk | 32 ------------------- ...roid.hardware.light@2.0-service.RMX3031.rc | 2 +- ...id.hardware.light@2.0-service.RMX3031.xml} | 0 rootdir/Android.mk | 2 +- rootdir/etc/init.mt6893.rc | 2 -- 10 files changed, 41 insertions(+), 45 deletions(-) create mode 100644 lights/Android.bp delete mode 100644 lights/Android.mk rename lights/{lights-mtk-default.xml => android.hardware.light@2.0-service.RMX3031.xml} (100%) diff --git a/device.mk b/device.mk index c134756..72b4787 100644 --- a/device.mk +++ b/device.mk @@ -41,15 +41,12 @@ TARGET_SCREEN_WIDTH := 1080 # A/B AB_OTA_UPDATER := false -# VNDK -PRODUCT_EXTRA_VNDK_VERSIONS := 30 - # Audio PRODUCT_PACKAGES += \ audio.a2dp.default PRODUCT_COPY_FILES += \ - $(DEVICE_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_EXTRA_VNDK_VERSIONS)/etc/audio_policy_configuration.xml + $(DEVICE_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml # Dex PRODUCT_DEXPREOPT_SPEED_APPS += \ @@ -65,7 +62,7 @@ PRODUCT_PACKAGES += \ android.hardware.biometrics.fingerprint@2.3-service.RMX3031 PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/android.hardware.fingerprint.xml + frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml # Freeform Multiwindow PRODUCT_COPY_FILES += \ @@ -89,7 +86,7 @@ PRODUCT_PACKAGES += \ # Keylayouts PRODUCT_COPY_FILES += \ - $(DEVICE_PATH)/keylayout/touchpanel.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/touchpanel.kl + $(DEVICE_PATH)/keylayout/touchpanel.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/touchpanel.kl # NFC PRODUCT_PACKAGES += \ @@ -100,7 +97,7 @@ PRODUCT_PACKAGES += \ Tag PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/nfc/libnfc-nxp.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/libnfc-nxp.conf + $(LOCAL_PATH)/nfc/libnfc-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf # Screen density PRODUCT_AAPT_CONFIG := xxxhdpi diff --git a/fingerprint/Android.bp b/fingerprint/Android.bp index efef057..900838f 100644 --- a/fingerprint/Android.bp +++ b/fingerprint/Android.bp @@ -38,6 +38,7 @@ cc_binary { "android.hardware.biometrics.fingerprint@2.3", "vendor.oplus.hardware.biometrics.fingerprint@2.1", ], + vendor: true } cc_library_static { diff --git a/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.RMX3031.rc b/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.RMX3031.rc index 902a571..af8d88c 100644 --- a/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.RMX3031.rc +++ b/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.RMX3031.rc @@ -18,7 +18,7 @@ on boot chown system system /sys/kernel/oppo_display/oppo_notify_fppress chown system system /sys/kernel/oppo_display/dimlayer_bl_en -service fps_hal.RMX3031 /system/bin/hw/android.hardware.biometrics.fingerprint@2.3-service.RMX3031 +service vendor.fps_hal.RMX3031 /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.3-service.RMX3031 class late_start user system group system input uhid diff --git a/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.RMX3031.xml b/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.RMX3031.xml index ff191b9..4931b8a 100644 --- a/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.RMX3031.xml +++ b/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.RMX3031.xml @@ -1,4 +1,4 @@ - + android.hardware.biometrics.fingerprint hwbinder diff --git a/lights/Android.bp b/lights/Android.bp new file mode 100644 index 0000000..ee5750e --- /dev/null +++ b/lights/Android.bp @@ -0,0 +1,32 @@ +// +// Copyright (C) 2021 The LineageOS Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +cc_binary { + name: "android.hardware.light@2.0-service.RMX3031", + defaults: ["hidl_defaults"], + init_rc: ["android.hardware.light@2.0-service.RMX3031.rc"], + vintf_fragments: ["android.hardware.light@2.0-service.RMX3031.xml"], + relative_install_path: "hw", + srcs: ["service.cpp", "Light.cpp"], + shared_libs: [ + "libbase", + "libhardware", + "libhidlbase", + "liblog", + "libutils", + "android.hardware.light@2.0", + ], + vendor: true, +} diff --git a/lights/Android.mk b/lights/Android.mk deleted file mode 100644 index 0a9a87d..0000000 --- a/lights/Android.mk +++ /dev/null @@ -1,32 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.light@2.0-service.RMX3031 -LOCAL_MODULE_STEM := android.hardware.lights-service.mediatek -LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_EXTRA_VNDK_VERSIONS)/bin -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_MODULE_TAGS := optional -LOCAL_REQUIRED_MODULES := lights-mtk-default.xml - -LOCAL_SRC_FILES := \ - service.cpp \ - Light.cpp - -LOCAL_SHARED_LIBRARIES := \ - liblog \ - libhidlbase \ - android.hardware.light@2.0 - -LOCAL_STATIC_LIBRARIES := \ - libbase \ - libutils - -include $(BUILD_EXECUTABLE) - -include $(CLEAR_VARS) -LOCAL_MODULE := lights-mtk-default.xml -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_EXTRA_VNDK_VERSIONS)/etc/vintf/manifest -include $(BUILD_PREBUILT) diff --git a/lights/android.hardware.light@2.0-service.RMX3031.rc b/lights/android.hardware.light@2.0-service.RMX3031.rc index 2ea7892..4e3e886 100644 --- a/lights/android.hardware.light@2.0-service.RMX3031.rc +++ b/lights/android.hardware.light@2.0-service.RMX3031.rc @@ -1,4 +1,4 @@ -service light-hal-2-0 /system/bin/hw/android.hardware.light@2.0-service.RMX3031 +service vendor.light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service.RMX3031 interface android.hardware.light@2.0::ILight default class hal user system diff --git a/lights/lights-mtk-default.xml b/lights/android.hardware.light@2.0-service.RMX3031.xml similarity index 100% rename from lights/lights-mtk-default.xml rename to lights/android.hardware.light@2.0-service.RMX3031.xml diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 4cda9f8..174d170 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -29,7 +29,7 @@ LOCAL_MODULE := fstab.mt6893 LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/fstab.mt6893 -LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_EXTRA_VNDK_VERSIONS)/etc +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc LOCAL_REQUIRED_MODULES := fstab.ramdisk include $(BUILD_PREBUILT) diff --git a/rootdir/etc/init.mt6893.rc b/rootdir/etc/init.mt6893.rc index 62d2145..4552c26 100644 --- a/rootdir/etc/init.mt6893.rc +++ b/rootdir/etc/init.mt6893.rc @@ -1,7 +1,5 @@ on init - mount none /vendor/lost+found /vendor/overlay bind setprop sys.usb.ffs.aio_compat 1 - setprop persist.vendor.vilte_support 0 # ZRAM setup write /sys/block/zram0/comp_algorithm lz4