From be3162ea8521d7524e2ae31407dc3340f3ae4875 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Wed, 2 Aug 2017 18:20:13 +0000 Subject: [PATCH] Revert "services.core: remove use of -static hidl java" Changes this depends on are missing from intermediate branches. This reverts commit 31eb20f06acdbf20570c841198434005e3145e8b. Change-Id: Ie3c30cf456f922d95ecb8859f0556095a491e2d6 --- services/core/Android.mk | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/services/core/Android.mk b/services/core/Android.mk index 94004ce8abe6..c90b40209fb8 100644 --- a/services/core/Android.mk +++ b/services/core/Android.mk @@ -27,12 +27,13 @@ LOCAL_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \ time_zone_distro \ time_zone_distro_installer \ - android.hardware.weaver-V1.0-java \ - android.hardware.biometrics.fingerprint-V2.1-java \ - android.hardware.oemlock-V1.0-java \ - android.hardware.tetheroffload.control-V1.0-java \ - android.hardware.vibrator-V1.0-java \ - android.hardware.configstore-V1.0-java + android.hidl.base-V1.0-java-static \ + android.hardware.weaver-V1.0-java-static \ + android.hardware.biometrics.fingerprint-V2.1-java-static \ + android.hardware.oemlock-V1.0-java-static \ + android.hardware.tetheroffload.control-V1.0-java-static \ + android.hardware.vibrator-V1.0-java-constants \ + android.hardware.configstore-V1.0-java-static ifneq ($(INCREMENTAL_BUILDS),) LOCAL_PROGUARD_ENABLED := disabled -- 2.11.0