From 31eb20f06acdbf20570c841198434005e3145e8b Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Tue, 1 Aug 2017 16:34:40 -0700 Subject: [PATCH] services.core: 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 device Change-Id: I6acb6a41fd5c62a3070ada373aed11706c423463 --- services/core/Android.mk | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/services/core/Android.mk b/services/core/Android.mk index c90b40209fb8..94004ce8abe6 100644 --- a/services/core/Android.mk +++ b/services/core/Android.mk @@ -27,13 +27,12 @@ LOCAL_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \ time_zone_distro \ time_zone_distro_installer \ - 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 + 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 ifneq ($(INCREMENTAL_BUILDS),) LOCAL_PROGUARD_ENABLED := disabled -- 2.11.0