From 4d054df74c860a49cf6833c941729de7c69b87fb Mon Sep 17 00:00:00 2001 From: Ilya Matyukhin Date: Tue, 18 May 2021 01:04:42 -0700 Subject: [PATCH] Split UDFPS makefiles into common, factory, and shipping Bug: 188193467 Test: build factory_oriole-userdebug Test: build factory_raven-userdebug Test: build oriole-userdebug Test: build raven-userdebug Change-Id: Ia2b725214189ff123239dbafad3bcb567f11f47b --- fingerprint/{udfps.mk => udfps_common.mk} | 4 ---- fingerprint/udfps_factory.mk | 1 + fingerprint/udfps_shipping.mk | 23 +++++++++++++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) rename fingerprint/{udfps.mk => udfps_common.mk} (88%) create mode 100644 fingerprint/udfps_shipping.mk diff --git a/fingerprint/udfps.mk b/fingerprint/udfps_common.mk similarity index 88% rename from fingerprint/udfps.mk rename to fingerprint/udfps_common.mk index dbd827a9..0eec7d22 100644 --- a/fingerprint/udfps.mk +++ b/fingerprint/udfps_common.mk @@ -24,7 +24,3 @@ PRODUCT_SOONG_NAMESPACES += vendor/goodix/udfps/g6_aidl_trusty SOONG_CONFIG_NAMESPACES += fp_hal_feature SOONG_CONFIG_fp_hal_feature += biometric_suez_support SOONG_CONFIG_fp_hal_feature_biometric_suez_support := true - -PRODUCT_PACKAGES += \ - android.hardware.biometrics.fingerprint@2.1-service.goodix \ - android.hardware.biometrics.fingerprint-service.goodix diff --git a/fingerprint/udfps_factory.mk b/fingerprint/udfps_factory.mk index 41aebe08..40993fb6 100644 --- a/fingerprint/udfps_factory.mk +++ b/fingerprint/udfps_factory.mk @@ -15,6 +15,7 @@ # PRODUCT_PACKAGES += \ + android.hardware.biometrics.fingerprint@2.1-service.goodix \ GF_delmar_factory \ udfps_test diff --git a/fingerprint/udfps_shipping.mk b/fingerprint/udfps_shipping.mk new file mode 100644 index 00000000..2b1e2ea2 --- /dev/null +++ b/fingerprint/udfps_shipping.mk @@ -0,0 +1,23 @@ +# +# Copyright (C) 2021 The Android Open-Source 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. +# + +PRODUCT_PACKAGES += \ + android.hardware.biometrics.fingerprint-service.goodix + +# Necessary to ignore the HIDL HAL configured in config_biometric_sensors. +# Otherwise system_server would hang trying to load the missing HIDL HAL. +PRODUCT_PROPERTY_OVERRIDES += \ + biometrics.fingerprint.hidl.disabled=true