BGT_sprout: Hardcode FINGERPRINT_HARDWARE_MODULE_ID to "fingerprint.fpc"

Change-Id: Id545287bed468f39738dbaa4c069660047055585

device.mk

@@ -229,7 +229,7 @@ PRODUCT_PACKAGES += \
 # Fingerprint
 PRODUCT_PACKAGES += \
     [email protected]_sprout \
-    [email protected].BGT_sprout
+    [email protected]
 
 # Gatekeeper
 PRODUCT_PACKAGES += \

fingerprint/Android.bp

@@ -1,12 +1,3 @@
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_interfaces_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_interfaces_license"],
-}
-
 cc_binary {
     name: "[email protected]_sprout",
     defaults: ["hidl_defaults"],

fingerprint/BiometricsFingerprint.cpp

@@ -215,7 +215,7 @@ fingerprint_device_t* BiometricsFingerprint::openHal() {
     int err;
     const hw_module_t *hw_mdl = nullptr;
     ALOGD("Opening fingerprint hal library...");
-    if (0 != (err = hw_get_module(FINGERPRINT_HARDWARE_MODULE_ID, &hw_mdl))) {
+    if (0 != (err = hw_get_module("fingerprint.fpc", &hw_mdl))) {
         ALOGE("Can't open fingerprint HW Module, error: %d", err);
         return nullptr;
     }

proprietary-files.txt

@@ -554,10 +554,9 @@ vendor/firmware/lagoon_ipa_fws.mdt
 vendor/firmware/mcfcheck.txt
 
 # Fingerprint
-vendor/lib64/hw/fingerprint.fpc.default.so:vendor/lib64/hw/fingerprint.lito.so
+vendor/lib64/hw/fingerprint.fpc.default.so:vendor/lib64/hw/fingerprint.fpc.lito.so
+vendor/lib/hw/fingerprint.fpc.default.so:vendor/lib/hw/fingerprint.fpc.lito.so
 vendor/lib64/[email protected]
-vendor/etc/init/vendor.fingerprint.rc
-vendor/bin/fingerprint
 
 # Gatekeeper
 vendor/bin/hw/[email protected]