From f2bb09bac323a402bd7d8402f13391cb1b9a6833 Mon Sep 17 00:00:00 2001 From: roynatech2544 Date: Sun, 12 Dec 2021 20:15:56 +0900 Subject: [PATCH] universal7885: hidl: remove useless guards and convert to bp Signed-off-by: roynatech2544 --- universal7885-common/BoardConfigCommon.mk | 3 - .../hidl/fingerprint/Android.bp | 22 +++++++ .../hidl/fingerprint/Android.mk | 61 ------------------- .../hidl/keymaster/Android.bp | 21 +++++++ universal7885-common/vendorsetup.sh | 1 - 5 files changed, 43 insertions(+), 65 deletions(-) create mode 100644 universal7885-common/hidl/fingerprint/Android.bp delete mode 100644 universal7885-common/hidl/fingerprint/Android.mk create mode 100644 universal7885-common/hidl/keymaster/Android.bp diff --git a/universal7885-common/BoardConfigCommon.mk b/universal7885-common/BoardConfigCommon.mk index f1eda32..0f14ce2 100644 --- a/universal7885-common/BoardConfigCommon.mk +++ b/universal7885-common/BoardConfigCommon.mk @@ -63,9 +63,6 @@ BOARD_MKBOOTIMG_ARGS := --kernel_offset 0x00008000 --ramdisk_offset 0x01000000 - TARGET_KERNEL_SOURCE := kernel/samsung/exynos7885 TARGET_KERNEL_CLANG_COMPILE := true -# Keymaster -TARGET_KEYMASTER_VARIANT := samsung - # HIDL include device/samsung/universal7885-common/configs/vintf/manifest.mk diff --git a/universal7885-common/hidl/fingerprint/Android.bp b/universal7885-common/hidl/fingerprint/Android.bp new file mode 100644 index 0000000..03e448f --- /dev/null +++ b/universal7885-common/hidl/fingerprint/Android.bp @@ -0,0 +1,22 @@ +cc_binary { + name: "android.hardware.biometrics.fingerprint@2.3-service.samsung", + defaults: ["hidl_defaults"], + proprietary: true, + init_rc: ["android.hardware.biometrics.fingerprint@2.3-service.samsung.rc"], + vintf_fragments: ["android.hardware.biometrics.fingerprint@2.3-service.samsung.xml"], + relative_install_path: "hw", + cflags: ["-DHAS_FINGERPRINT_GESTURES"], + srcs: [ + "BiometricsFingerprint.cpp", + "service.cpp", + ], + shared_libs: [ + "liblog", + "libcutils", + "libhardware", + "libbase", + "libutils", + "libhidlbase", + "android.hardware.biometrics.fingerprint@2.3", + ], +} diff --git a/universal7885-common/hidl/fingerprint/Android.mk b/universal7885-common/hidl/fingerprint/Android.mk deleted file mode 100644 index 2f0d1e3..0000000 --- a/universal7885-common/hidl/fingerprint/Android.mk +++ /dev/null @@ -1,61 +0,0 @@ -# -# Copyright (C) 2019 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 := \ - BiometricsFingerprint.cpp \ - service.cpp - -LOCAL_SHARED_LIBRARIES := \ - libbase \ - libhardware \ - libhidlbase \ - liblog \ - libutils \ - android.hardware.biometrics.fingerprint@2.1 \ - android.hardware.biometrics.fingerprint@2.2 \ - android.hardware.biometrics.fingerprint@2.3 - -ifeq ($(TARGET_SEC_FP_CALL_NOTIFY_ON_CANCEL),true) - LOCAL_CFLAGS += -DCALL_NOTIFY_ON_CANCEL -endif - -ifeq ($(TARGET_SEC_FP_USES_PERCENTAGE_SAMPLES),true) - LOCAL_CFLAGS += -DUSES_PERCENTAGE_SAMPLES -endif - -ifeq ($(TARGET_SEC_FP_CALL_CANCEL_ON_ENROLL_COMPLETION),true) - LOCAL_CFLAGS += -DCALL_CANCEL_ON_ENROLL_COMPLETION -endif - -ifeq ($(TARGET_SEC_FP_HAS_FINGERPRINT_GESTURES),true) - LOCAL_CFLAGS += -DHAS_FINGERPRINT_GESTURES -endif - -LOCAL_MODULE := android.hardware.biometrics.fingerprint@2.3-service.samsung -LOCAL_INIT_RC := android.hardware.biometrics.fingerprint@2.3-service.samsung.rc -LOCAL_VINTF_FRAGMENTS := android.hardware.biometrics.fingerprint@2.3-service.samsung.xml -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_OWNER := samsung -LOCAL_VENDOR_MODULE := true - -include $(BUILD_EXECUTABLE) - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/universal7885-common/hidl/keymaster/Android.bp b/universal7885-common/hidl/keymaster/Android.bp new file mode 100644 index 0000000..7ab3da3 --- /dev/null +++ b/universal7885-common/hidl/keymaster/Android.bp @@ -0,0 +1,21 @@ +cc_binary { + name: "android.hardware.keymaster@4.0-service.samsung", + defaults: ["hidl_defaults"], + proprietary: true, + init_rc: ["android.hardware.keymaster@4.0-service.samsung.rc"], + relative_install_path: "hw", + srcs: [ + "service.cpp", + ], + shared_libs: [ + "liblog", + "libcutils", + "libhardware", + "libbase", + "libutils", + "libhidlbase", + "android.hardware.keymaster@4.0", + "libskeymaster4device", + "libkeymaster4", + ], +} diff --git a/universal7885-common/vendorsetup.sh b/universal7885-common/vendorsetup.sh index 4424093..5ede59b 100644 --- a/universal7885-common/vendorsetup.sh +++ b/universal7885-common/vendorsetup.sh @@ -1,5 +1,4 @@ rm -rf hardware/samsung -git clone git@github.com:eurekadevelopment/android_hardware_samsung.git hardware/samsung -b NEW_NUKE_ALL git clone git@github.com:eurekadevelopment/Eureka-Kernel-Exynos7885-Q-R-S-private.git kernel/samsung/exynos7885 --depth=1 -b R8.1_rom git clone https://github.com/lineageos/android_hardware_samsung_nfc hardware/samsung/nfc git clone https://github.com/lineageos/android_hardware_samsung_slsi_libbt hardware/samsung_slsi/libbt