From 891ca20fabab3e3a038820ae696a7fcfd78f61e4 Mon Sep 17 00:00:00 2001 From: SamarV-121 Date: Tue, 26 Jan 2021 22:01:46 +0530 Subject: [PATCH] universal7885: power: Convert to blueprint * also rebrand to universal7885 Change-Id: Id2cddbef53eaecb2ee5df08ec635af55c104f97f Signed-off-by: SamarV-121 --- power/Android.bp | 42 +++++++++++++++++ power/Android.mk | 46 ------------------- ...rdware.power@1.0-service.universal7904.rc} | 2 +- sepolicy/private/file_contexts | 3 +- 4 files changed, 44 insertions(+), 49 deletions(-) create mode 100644 power/Android.bp delete mode 100644 power/Android.mk rename power/{android.hardware.power@1.0-service.exynos.rc => android.hardware.power@1.0-service.universal7904.rc} (79%) diff --git a/power/Android.bp b/power/Android.bp new file mode 100644 index 0000000..bfa87c6 --- /dev/null +++ b/power/Android.bp @@ -0,0 +1,42 @@ +// +// 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. +// + +cc_binary { + name: "android.hardware.power@1.0-service.universal7904", + + srcs: [ + "Power.cpp", + "service.cpp", + ], + + include_dirs: ["hardware/samsung/hidl/light/include"], + local_include_dirs: ["include"], + + shared_libs: [ + "libbase", + "libbinder", + "libhidlbase", + "libutils", + "android.hardware.power@1.0", + "vendor.lineage.power@1.0", + ], + + static_libs: ["libc++fs"], + + init_rc: ["android.hardware.power@1.0-service.universal7904.rc"], + relative_install_path: "hw", + +} diff --git a/power/Android.mk b/power/Android.mk deleted file mode 100644 index 60a4b85..0000000 --- a/power/Android.mk +++ /dev/null @@ -1,46 +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_SRC_FILES := \ - Power.cpp \ - service.cpp - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/include \ - hardware/samsung/hidl/light/include - -LOCAL_SHARED_LIBRARIES := \ - libbase \ - libbinder \ - libhidlbase \ - libutils \ - android.hardware.power@1.0 \ - vendor.lineage.power@1.0 - -LOCAL_STATIC_LIBRARIES := libc++fs - -LOCAL_MODULE := android.hardware.power@1.0-service.universal7904 -LOCAL_MODULE_STEM := android.hardware.power@1.0-service.exynos -LOCAL_INIT_RC := $(LOCAL_MODULE_STEM).rc -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_OWNER := samsung - -include $(BUILD_EXECUTABLE) diff --git a/power/android.hardware.power@1.0-service.exynos.rc b/power/android.hardware.power@1.0-service.universal7904.rc similarity index 79% rename from power/android.hardware.power@1.0-service.exynos.rc rename to power/android.hardware.power@1.0-service.universal7904.rc index 16085b6..bc19e4d 100644 --- a/power/android.hardware.power@1.0-service.exynos.rc +++ b/power/android.hardware.power@1.0-service.universal7904.rc @@ -1,4 +1,4 @@ -service vendor.power-hal-1-0 /system/bin/hw/android.hardware.power@1.0-service.exynos +service vendor.power-hal-1-0 /system/bin/hw/android.hardware.power@1.0-service.universal7904 class hal user system group system diff --git a/sepolicy/private/file_contexts b/sepolicy/private/file_contexts index 42ed6e1..78c8a2c 100644 --- a/sepolicy/private/file_contexts +++ b/sepolicy/private/file_contexts @@ -3,10 +3,9 @@ # HALs /system/bin/hw/lineage\.touch@1\.0-service\.samsung u:object_r:hal_touch_samsung_exec:s0 -/system/bin/hw/android\.hardware\.power@1\.0-service\.exynos u:object_r:hal_power_default_exec:s0 +/system/bin/hw/android\.hardware\.power@1\.0-service\.universal7904 u:object_r:hal_power_default_exec:s0 /system/bin/hw/lineage\.fastcharge@1\.0-service\.samsung u:object_r:hal_fastcharge_samsung_exec:s0 # Vendor overlay /(product|system/product)/vendor_overlay/[0-9]+/etc(/.*)? u:object_r:vendor_configs_file:s0 /(product|system/product)/vendor_overlay/[0-9]+/lib(64)?/hw u:object_r:vendor_hal_file:s0 -