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
This commit is contained in:
Steven Moreland
2017-08-03 12:35:08 -07:00
parent 4411448a55
commit eeb0153e82

View File

@@ -602,8 +602,10 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(framework_res_R_stamp)
LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt okhttp bouncycastle ext
LOCAL_STATIC_JAVA_LIBRARIES := \
framework-protos \
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