fingerprint: remove use of -static hidl java

These libraries are being removed. Now, the regular java
library can be used as both a static and non-static library,
we are removing these duplicate libraries which cause
several types problems (such as undefined behavior when
both the static and non-static libs are loaded).

Bug: 36376126
Test: boot marlin, add/use fingerprint, check logs
Change-Id: I546d8f5d5788a31b3f70009e687246a4b7e59569

diff --git a/services/Android.mk b/services/Android.mk
index 5c863b0..17fc468 100644 (file)
--- a/services/Android.mk
+++ b/services/Android.mk
@@ -41,8 +41,8 @@ services := \
 
 # The convention is to name each service module 'services.$(module_name)'
 LOCAL_STATIC_JAVA_LIBRARIES := $(addprefix services.,$(services)) \
-    android.hidl.base-V1.0-java-static \
-    android.hardware.biometrics.fingerprint-V2.1-java-static
+    android.hidl.base-V1.0-java \
+    android.hardware.biometrics.fingerprint-V2.1-java
 
 ifeq ($(EMMA_INSTRUMENT_FRAMEWORK),true)
 LOCAL_EMMA_INSTRUMENT := true