Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jim Miller
2017-01-18 00:52:14 +00:00
committed by Android (Google) Code Review
parent 70c5c30afa 163c7d3f0d
commit f49d58a1aa
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/Android.mk
View File

@@ -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

4
services/core/Android.mk
View File

@@ -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