From 163c7d3f0d1f43b1e1ff0eeaa88c3cac6dbcff91 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Tue, 17 Jan 2017 14:56:57 -0800 Subject: [PATCH] Link framework with static library to satisfy javac build dependency The build dependency works for Jack, but not for javac. The fix is to include a static library in LOCAL_STATIC_JAVA_LIBRARIES. Test: compiles with no errors for the fast build target, fingerprint work on device. Fixes bug 34352319 Change-Id: I23ed5b3be4e60aca85dc1e33bbbc3156bee57c1d --- services/Android.mk | 4 ++-- services/core/Android.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/Android.mk b/services/Android.mk index abd1459dc65e4..e760fe2bed13e 100644 --- a/services/Android.mk +++ b/services/Android.mk @@ -37,8 +37,8 @@ services := \ # The convention is to name each service module 'services.$(module_name)' LOCAL_STATIC_JAVA_LIBRARIES := $(addprefix services.,$(services)) \ - android.hidl.base@1.0-java \ - android.hardware.biometrics.fingerprint@2.1-java + android.hidl.base@1.0-java-static \ + android.hardware.biometrics.fingerprint@2.1-java-static ifeq ($(EMMA_INSTRUMENT_FRAMEWORK),true) LOCAL_EMMA_INSTRUMENT := true diff --git a/services/core/Android.mk b/services/core/Android.mk index 07f14d4ff8a41..cd88b85b415a3 100644 --- a/services/core/Android.mk +++ b/services/core/Android.mk @@ -25,8 +25,8 @@ LOCAL_JAVA_LIBRARIES := \ android.hardware.tv.cec@1.0-java LOCAL_STATIC_JAVA_LIBRARIES := tzdata_update2 \ - android.hidl.base@1.0-java \ - android.hardware.biometrics.fingerprint@2.1-java \ + android.hidl.base@1.0-java-static \ + android.hardware.biometrics.fingerprint@2.1-java-static \ ifneq ($(INCREMENTAL_BUILDS),) LOCAL_PROGUARD_ENABLED := disabled