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

Commit 163c7d3f authored by Jim Miller's avatar Jim Miller
Browse files

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
parent 04e7b6c6

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