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

Commit eeb0153e authored by Steven Moreland's avatar Steven Moreland
Browse files

Remove dependency on CalHas.mk. 

Now that we can, include dependency on hal
directly.

Test: java links
Test: wip/todo
Change-Id: I45f8c5befab80add7c80cf59dc5c5c56519d295d
Fixes: 64294630
parent 4411448a

Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -604,6 +604,8 @@ 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.cas-V1.0-java                       \

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

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

    android.hardware.tv.input-V1.0-java-constants        \
@@ -613,8 +615,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    android.hardware.vibrator-V1.1-java-constants        \

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



include hardware/interfaces/cas/1.0/CasHal.mk



# Loaded with System.loadLibrary by android.view.textclassifier

LOCAL_REQUIRED_MODULES += libtextclassifier