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

Commit 94293086 authored by Sundong Ahn's avatar Sundong Ahn
Browse files

Change dependency library 

hwbinder.jar will be used instead of framework.jar on build-time, but
on runtime framework.jar will be used.

This is to cut the circular dependency when using configstore from
Android framework.

Bug: 35771640
Test: no test.
Change-Id: I04cab676c91d2ea423f5e2c1b2b9efa15e522f37
parent 49dad304

bluetooth/1.0/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) 
LOCAL_JAVA_LIBRARIES := \

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



LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES += core-oj hwbinder



#

# Build types.hal (Status)
@@ -94,6 +96,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) 
LOCAL_STATIC_JAVA_LIBRARIES := \

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



LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES := core-oj hwbinder



#

# Build types.hal (Status)

boot/1.0/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) 
LOCAL_JAVA_LIBRARIES := \

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



LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES += core-oj hwbinder



#

# Build types.hal (BoolResult)
@@ -90,6 +92,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) 
LOCAL_STATIC_JAVA_LIBRARIES := \

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



LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES := core-oj hwbinder



#

# Build types.hal (BoolResult)

configstore/1.0/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) 
LOCAL_JAVA_LIBRARIES := \

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



LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES += core-oj hwbinder



#

# Build types.hal (OptionalBool)
@@ -166,6 +168,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) 
LOCAL_STATIC_JAVA_LIBRARIES := \

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



LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES := core-oj hwbinder



#

# Build types.hal (OptionalBool)

ir/1.0/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) 
LOCAL_JAVA_LIBRARIES := \

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



LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES += core-oj hwbinder



#

# Build types.hal (ConsumerIrFreqRange)
@@ -71,6 +73,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) 
LOCAL_STATIC_JAVA_LIBRARIES := \

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



LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES := core-oj hwbinder



#

# Build types.hal (ConsumerIrFreqRange)

nfc/1.0/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) 
LOCAL_JAVA_LIBRARIES := \

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



LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES += core-oj hwbinder



#

# Build types.hal (NfcEvent)
@@ -113,6 +115,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) 
LOCAL_STATIC_JAVA_LIBRARIES := \

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



LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES := core-oj hwbinder



#

# Build types.hal (NfcEvent)