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

Commit f49d58a1 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Link framework with static library to satisfy javac build dependency"

parents 70c5c30a 163c7d3f

services/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -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

services/core/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -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