Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffae2caa authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "Revert "services.core: remove use of -static hidl java"" into... 

Merge "Revert "services.core: remove use of -static hidl java"" into oc-dr1-dev-plus-aosp am: 7ac34b86
am: e3a06785

Change-Id: Iab06f4c9a6f29b43f129557ef4bc7f8410350fef
parents 97c641d3 e3a06785

services/core/Android.mk

+7 −6
Original line number Original line Diff line number Diff line
@@ -27,12 +27,13 @@ LOCAL_JAVA_LIBRARIES := \ 
LOCAL_STATIC_JAVA_LIBRARIES := \

LOCAL_STATIC_JAVA_LIBRARIES := \

    time_zone_distro \

    time_zone_distro \

    time_zone_distro_installer \

    time_zone_distro_installer \

    android.hardware.weaver-V1.0-java \

    android.hidl.base-V1.0-java-static \

    android.hardware.biometrics.fingerprint-V2.1-java \

    android.hardware.weaver-V1.0-java-static \

    android.hardware.oemlock-V1.0-java \

    android.hardware.biometrics.fingerprint-V2.1-java-static \

    android.hardware.tetheroffload.control-V1.0-java \

    android.hardware.oemlock-V1.0-java-static \

    android.hardware.vibrator-V1.0-java \

    android.hardware.tetheroffload.control-V1.0-java-static \

    android.hardware.configstore-V1.0-java

    android.hardware.vibrator-V1.0-java-constants \

    android.hardware.configstore-V1.0-java-static





ifneq ($(INCREMENTAL_BUILDS),)

ifneq ($(INCREMENTAL_BUILDS),)

    LOCAL_PROGUARD_ENABLED := disabled

    LOCAL_PROGUARD_ENABLED := disabled