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

Commit 05b4d480 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix an unnecessary dependency (framework => health@2.0-java)"

parents d09afdc4 97505372

Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -618,8 +618,6 @@ LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt okhttp bouncycastle ext 
LOCAL_STATIC_JAVA_LIBRARIES :=                           \

    framework-protos                                     \

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

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

    android.hardware.health-V2.0-java                    \

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

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

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

services/core/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    time_zone_distro \

    time_zone_distro_installer \

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

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

    android.hardware.health-V2.0-java \

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

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

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