LenovoZ5s/device_lenovo_sdm710-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kunlun2: Drop vendor_overlay and its hax

Browse source
This commit is contained in:
Giammarco Senatore 2021-07-10 14:34:58 +02:00
parent 47f9cbc14b
commit 38b77bd32e
No known key found for this signature in database
GPG key ID: 661348FC1E144F04
19 changed files with 33 additions and 158 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config.fs
View file

@ -1,5 +0,0 @@
[system/product/vendor_overlay/*/bin/*]
mode: 0755
user: AID_ROOT
group: AID_SHELL
caps: 0

9
device.mk
View file

@ -9,10 +9,6 @@ $(call inherit-product-if-exists, vendor/lenovo/kunlun2/kunlun2-vendor.mk)
# Enable updating of APEXes # Enable updating of APEXes
$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
# VNDK
PRODUCT_TARGET_VNDK_VERSION := 29
PRODUCT_EXTRA_VNDK_VERSIONS := 29
# Boot animation # Boot animation
TARGET_SCREEN_HEIGHT := 2244 TARGET_SCREEN_HEIGHT := 2244
TARGET_SCREEN_WIDTH := 1080 TARGET_SCREEN_WIDTH := 1080
@ -49,7 +45,7 @@ PRODUCT_COPY_FILES += \
# Common init scripts # Common init scripts
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
init.qcom.rc \ init.custom.rc \
init.power.rc init.power.rc
# Display # Display
@ -75,9 +71,6 @@ PRODUCT_PACKAGES += \
android.hidl.base@1.0 \ android.hidl.base@1.0 \
libhidltransport libhidltransport
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/vendor_override_manifest.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/vendor_override_manifest.xml
# IMS # IMS
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
ims-ext-common \ ims-ext-common \

5
libhidl/Android.bp Normal file
View file

@ -0,0 +1,5 @@
cc_library {
name: "android.hidl.base@1.0",
shared_libs: ["libhidlbase"],
vendor_available: true,
}

20
libhidl/Android.mk
View file

@ -1,20 +0,0 @@
#
# Copyright (C) 2017 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.
include $(CLEAR_VARS)
LOCAL_MODULE := android.hidl.base@1.0
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
include $(BUILD_SHARED_LIBRARY)

23
libplatformconfig/Android.mk
View file

@ -1,23 +0,0 @@
#
# Copyright (C) 2020 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.
#
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := libplatformconfig
LOCAL_MODULE_TAGS := optional
LOCAL_VENDOR_MODULE := true
include $(BUILD_SHARED_LIBRARY)

16
light/Android.bp Normal file
View file

@ -0,0 +1,16 @@
cc_binary {
relative_install_path: "hw",
defaults: ["hidl_defaults"],
name: "android.hardware.light@2.0-service.lenovo_kunlun2",
init_rc: ["android.hardware.light@2.0-service.lenovo_kunlun2.rc"],
srcs: ["service.cpp", "Light.cpp"],
vendor: true,
shared_libs: [
"libbase",
"libhardware",
"libhidlbase",
"liblog",
"libutils",
"android.hardware.light@2.0",
],
}

42
light/Android.mk
View file

@ -1,42 +0,0 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.light@2.0-service.lenovo_kunlun2
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/bin
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_MODULE_STEM := android.hardware.light@2.0-service
LOCAL_SRC_FILES := \
service.cpp \
Light.cpp
LOCAL_REQUIRED_MODULES := \
android.hardware.light@2.0-service.lenovo_kunlun2.rc
LOCAL_SHARED_LIBRARIES := \
libhardware \
libhidlbase \
liblog \
android.hardware.light@2.0
LOCAL_STATIC_LIBRARIES := \
libbase \
libutils
include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.light@2.0-service.lenovo_kunlun2.rc
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/init
LOCAL_MODULE_STEM := android.hardware.light@2.0-service.rc
LOCAL_SRC_FILES := android.hardware.light@2.0-service.lenovo_kunlun2.rc
include $(BUILD_PREBUILT)

2
light/android.hardware.light@2.0-service.lenovo_kunlun2.rc
View file

@ -54,7 +54,7 @@ on boot
chmod 660 /sys/class/leds/green/ramp_step_ms chmod 660 /sys/class/leds/green/ramp_step_ms
chmod 660 /sys/class/leds/green/start_idx chmod 660 /sys/class/leds/green/start_idx
service vendor.light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service service vendor.light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service.lenovo_kunlun2
interface android.hardware.light@2.0::ILight default interface android.hardware.light@2.0::ILight default
class hal class hal
user system user system

6
overlay-pe/frameworks/base/core/res/res/values/custom_config.xml
View file

@ -55,12 +55,6 @@
<!-- Whether to post reset runnable for all clients --> <!-- Whether to post reset runnable for all clients -->
<bool name="config_fingerprintPostResetRunnableForAllClients">true</bool> <bool name="config_fingerprintPostResetRunnableForAllClients">true</bool>
<!-- The list of vendor package signatures that should also be considered
platform signatures, specifically for use on devices with a vendor partition. -->
<string-array name="config_vendorPlatformSignatures" translatable="false">
<item>308203e1308202c9a0030201020209008048d69df79e3274300d06092a864886f70d01010b0500308186310b300906035504061302434e310b300906035504080c02424a3115301306035504070c0c4265696a696e672056696577310f300d060355040a0c064c454e4f564f310f300d060355040b0c064d6f62696c65310f300d06035504030c064c454e4f564f3120301e06092a864886f70d01090116116c656e6f766f406c656e6f766f2e636f6d301e170d3138303130343031313630365a170d3435303532323031313630365a308186310b300906035504061302434e310b300906035504080c02424a3115301306035504070c0c4265696a696e672056696577310f300d060355040a0c064c454e4f564f310f300d060355040b0c064d6f62696c65310f300d06035504030c064c454e4f564f3120301e06092a864886f70d01090116116c656e6f766f406c656e6f766f2e636f6d30820122300d06092a864886f70d01010105000382010f003082010a0282010100d41b9cff129f6bba58d91de03a10a5b0f386939879c1930a51e1c838d1b8a93ff45afde0faeabfa6c169c44e7b8a23b3891192f930868a3d6dc14df5675cc1554eb25d33f60597092df8a82d27cdf25437001677d574f5685acdff9e85ff9bf21e7440de5b98109492ba5466ebf9fcd814b8d0124bfef998c84c7b3178f3937c6333849dd4036963ce4b27d304d4ccdd90d29d7fa60a254c9a033a5b2f64fc79eab166b1a008a01459874e426368700181d5d611c74ca11064bb20cf5475232579d1d799ffb9d293859562ddb3b70df54cc5762db4414d6a43beacb5d54380189b2dda7a0940189ff9edf74da9c624d62ff8561d90f57eeba060f0c68f4abb210203010001a350304e301d0603551d0e04160414c34a6547eeccafd25ed357ea0ff29beebb5535c0301f0603551d23041830168014c34a6547eeccafd25ed357ea0ff29beebb5535c0300c0603551d13040530030101ff300d06092a864886f70d01010b050003820101009de7d35d241f83b8b3788e0dd664f3cf0d9048a31b6322b5cc3dc0e74392636266a69491315af1cd9e72689cedaa1e7560f668f2658f7e4c51b7280d603a6494b23f2680a43ab8112fc15377fc86de50f999a02daab121605a6ceb8e6abfacb52a766d970fa5dea3fd2aebbc0d48863e2b72b65870f1df25fe1e9671d79decce042d100dc4922b793133c4e16bdaf5be82534e6c2803f5dc92aae2955e1bb97830949e4c4fa9ec42c33e2c4c4e5702c8bb079519587d47b99b8bce2d289e89ef94298568bd8ea235788614a80c41002f65d2a792a6a9377a819fcfaf1c25b282588bc3f67c30e8aee8ab4c7c39b2db58c91a8e5a132d02881b082797ab7dbefe</item>
</string-array>
<!-- Default value for proximity check on screen wake <!-- Default value for proximity check on screen wake
NOTE ! - Enable for devices that have a fast response proximity sensor (ideally < 300ms)--> NOTE ! - Enable for devices that have a fast response proximity sensor (ideally < 300ms)-->
<bool name="config_proximityCheckOnWake">true</bool> <bool name="config_proximityCheckOnWake">true</bool>

2
power-libperfmgr/Android.bp
View file

@ -6,6 +6,7 @@ cc_library_headers {
cc_library { cc_library {
name: "libdisppower-lenovo", name: "libdisppower-lenovo",
vendor: true,
srcs: [ srcs: [
"disp-power/InteractionHandler.cpp", "disp-power/InteractionHandler.cpp",
], ],
@ -23,6 +24,7 @@ cc_binary {
relative_install_path: "hw", relative_install_path: "hw",
init_rc: ["aidl/android.hardware.power-service.lenovo.rc"], init_rc: ["aidl/android.hardware.power-service.lenovo.rc"],
vintf_fragments: ["aidl/android.hardware.power-service.lenovo.xml"], vintf_fragments: ["aidl/android.hardware.power-service.lenovo.xml"],
vendor: true,
shared_libs: [ shared_libs: [
"android.hardware.power-ndk_platform", "android.hardware.power-ndk_platform",
"libbase", "libbase",

2
power-libperfmgr/aidl/android.hardware.power-service.lenovo.rc
View file

@ -1,4 +1,4 @@
service vendor.power-hal-aidl /system/bin/hw/android.hardware.power-service.lenovo service vendor.power-hal-aidl /vendor/bin/hw/android.hardware.power-service.lenovo
class hal class hal
user root user root
group system group system

2
power-libperfmgr/aidl/android.hardware.power-service.lenovo.xml
View file

@ -1,4 +1,4 @@
<manifest version="1.0" type="framework"> <manifest version="1.0" type="device">
<hal format="aidl"> <hal format="aidl">
<name>android.hardware.power</name> <name>android.hardware.power</name>
<fqname>IPower/default</fqname> <fqname>IPower/default</fqname>

2
power-libperfmgr/aidl/service.cpp
View file

@ -30,7 +30,7 @@ using aidl::google::hardware::power::impl::pixel::Power;
using aidl::google::hardware::power::impl::pixel::PowerExt; using aidl::google::hardware::power::impl::pixel::PowerExt;
using ::android::perfmgr::HintManager; using ::android::perfmgr::HintManager;
constexpr char kPowerHalConfigPath[] = "/system/etc/powerhint.json"; constexpr char kPowerHalConfigPath[] = "/vendor/etc/powerhint.json";
constexpr char kPowerHalInitProp[] = "vendor.powerhal.init"; constexpr char kPowerHalInitProp[] = "vendor.powerhal.init";
int main() { int main() {

4
proprietary-files.txt
View file

@ -1,8 +1,8 @@
# All unpinned blobs below are extracted from ZUI 11.5.117 # All unpinned blobs below are extracted from ZUI 11.5.117
# Audio - from enchilada - QKQ1.190716.003 # Audio - from enchilada - QKQ1.190716.003
vendor/lib64/soundfx/libvolumelistener.so:product/vendor_overlay/29/lib64/soundfx/libvolumelistener.so|5ea2812a582c76f7db3a7e5e4fb4cc33bbca3d9b vendor/lib64/soundfx/libvolumelistener.so|5ea2812a582c76f7db3a7e5e4fb4cc33bbca3d9b
vendor/lib/soundfx/libvolumelistener.so:product/vendor_overlay/29/lib/soundfx/libvolumelistener.so|776906b3f70c7764245e8b394fd23333aa811bfd vendor/lib/soundfx/libvolumelistener.so|776906b3f70c7764245e8b394fd23333aa811bfd
# Bluetooth (aptX) - from crosshatch - QP1A.190711.020 # Bluetooth (aptX) - from crosshatch - QP1A.190711.020
product/lib64/libaptX_encoder.so|df1c89d7af1bb35808d5fe3496b04ba066c10cbc product/lib64/libaptX_encoder.so|df1c89d7af1bb35808d5fe3496b04ba066c10cbc

4
rootdir/Android.mk
View file

@ -1,10 +1,10 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := init.qcom.rc LOCAL_MODULE := init.custom.rc
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := etc/init.qcom.rc LOCAL_SRC_FILES := etc/init.custom.rc
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/init LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/init
include $(BUILD_PREBUILT) include $(BUILD_PREBUILT)

19
rootdir/etc/init.qcom.rc → rootdir/etc/init.custom.rc
View file

@ -41,13 +41,6 @@ on init
write /sys/block/zram0/comp_algorithm lz4 write /sys/block/zram0/comp_algorithm lz4
write /proc/sys/vm/page-cluster 0 write /proc/sys/vm/page-cluster 0
mount none /system/etc/audio_policy_configuration.xml /vendor/etc/audio_policy_configuration.xml bind
mount none /system/etc/thermal-engine.conf /vendor/etc/thermal-engine.conf bind
mount none /system/etc/wifi/WCNSS_qcom_cfg.ini /vendor/etc/wifi/WCNSS_qcom_cfg.ini bind
mount none /system/etc/init/android.hardware.light@2.0-service.rc /vendor/etc/init/android.hardware.light@2.0-service.rc bind
mount none /vendor/lost+found /vendor/overlay bind
mount none /system/etc/vendor_override_manifest.xml /vendor/etc/vintf/manifest/android.hardware.atrace@1.0-service.xml bind
# set default schedTune value for foreground/top-app # set default schedTune value for foreground/top-app
# Set default values for foreground and top-app stune # Set default values for foreground and top-app stune
write /dev/stune/foreground/schedtune.prefer_idle 1 write /dev/stune/foreground/schedtune.prefer_idle 1
@ -85,15 +78,3 @@ service charger /system/bin/charger
group system graphics input group system graphics input
capabilities SYS_BOOT capabilities SYS_BOOT
seclabel u:r:charger:s0 seclabel u:r:charger:s0
service cvphalservice /system/bin/true
disabled
service vendor.power-hal-1-0 /system/bin/true
disabled
service iop-hal-2-0 /system/bin/true
disabled
service perf-hal-2-0 /system/bin/true
disabled

6
sepolicy/private/file_contexts
View file

@ -13,7 +13,7 @@
# HALs # HALs
/system/bin/hw/android\.hardware\.power-service\.lenovo u:object_r:hal_power_pixel_exec:s0 /system/bin/hw/android\.hardware\.power-service\.lenovo u:object_r:hal_power_pixel_exec:s0
/system/bin/hw/lineage\.livedisplay@2\.0-service-sdm u:object_r:shal_livedisplay_default_exec:s0 /system/bin/hw/lineage\.livedisplay@2\.0-service-sdm u:object_r:shal_livedisplay_default_exec:s0
/(product|system/product)/vendor_overlay/[0-9]+/bin/hw/android\.hardware\.light@2\.0-service u:object_r:hal_light_default_exec:s0 /(system|system/vendor)/bin/hw/android\.hardware\.light@2\.0-service u:object_r:hal_light_default_exec:s0
# IMS # IMS
/vendor/bin/imsdatadaemon u:object_r:ims_exec:s0 /vendor/bin/imsdatadaemon u:object_r:ims_exec:s0
@ -23,7 +23,3 @@
# Touch # Touch
/sys/class/touch/tp_dev/gesture_on u:object_r:sysfs_tp:s0 /sys/class/touch/tp_dev/gesture_on u:object_r:sysfs_tp:s0
# Vendor overlay
/(product|system/product)/vendor_overlay/[0-9]+/lib(64)?/hw u:object_r:vendor_hal_file:s0
/(product|system/product)/vendor_overlay/[0-9]+/lib(64)?/soundfx u:object_r:vendor_hal_file:s0

3
sepolicy/private/init.te
View file

@ -5,9 +5,6 @@ allow init proc_touchpanel:file { write setattr open};
allow init vendor_configs_file:dir mounton; allow init vendor_configs_file:dir mounton;
allow init vendor_configs_file:file mounton; allow init vendor_configs_file:file mounton;
# Allow init to mount vendor overlay
allow init vendor_overlay_file:dir mounton;
allow init self:netlink_generic_socket read; allow init self:netlink_generic_socket read;
allow init sysfs_tp:file setattr; allow init sysfs_tp:file setattr;

19
vendor_override_manifest.xml
View file

@ -1,19 +0,0 @@
<manifest version="1.0" type="device">
<hal format="hidl">
<name>android.hardware.atrace</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
<name>IAtraceDevice</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" override="true">
<name>android.hardware.power</name>
<transport>hwbinder</transport>
</hal>
<hal format="hidl" override="true">
<name>vendor.qti.hardware.perf</name>
<transport>hwbinder</transport>
</hal>
</manifest>