From 94293086f837aa74e244d9df45ace1b557979eff Mon Sep 17 00:00:00 2001 From: Sundong Ahn Date: Thu, 13 Jul 2017 17:03:17 +0900 Subject: [PATCH] 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 --- bluetooth/1.0/Android.mk | 4 ++++ boot/1.0/Android.mk | 4 ++++ configstore/1.0/Android.mk | 4 ++++ ir/1.0/Android.mk | 4 ++++ nfc/1.0/Android.mk | 4 ++++ radio/1.0/Android.mk | 4 ++++ radio/1.1/Android.mk | 4 ++++ radio/deprecated/1.0/Android.mk | 4 ++++ tests/baz/1.0/Android.mk | 4 ++++ tests/expression/1.0/Android.mk | 4 ++++ tests/hash/1.0/Android.mk | 4 ++++ tests/inheritance/1.0/Android.mk | 4 ++++ tests/libhwbinder/1.0/Android.mk | 4 ++++ tests/multithread/1.0/Android.mk | 4 ++++ tetheroffload/control/1.0/Android.mk | 4 ++++ wifi/1.0/Android.mk | 4 ++++ wifi/supplicant/1.0/Android.mk | 4 ++++ 17 files changed, 68 insertions(+) diff --git a/bluetooth/1.0/Android.mk b/bluetooth/1.0/Android.mk index f8cd96e367..5dade87f51 100644 --- a/bluetooth/1.0/Android.mk +++ b/bluetooth/1.0/Android.mk @@ -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) diff --git a/boot/1.0/Android.mk b/boot/1.0/Android.mk index efd5759c4c..5ef55f31d8 100644 --- a/boot/1.0/Android.mk +++ b/boot/1.0/Android.mk @@ -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) diff --git a/configstore/1.0/Android.mk b/configstore/1.0/Android.mk index 6be99dbbf7..59eff955f9 100644 --- a/configstore/1.0/Android.mk +++ b/configstore/1.0/Android.mk @@ -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) diff --git a/ir/1.0/Android.mk b/ir/1.0/Android.mk index bdb3b295f5..96812df854 100644 --- a/ir/1.0/Android.mk +++ b/ir/1.0/Android.mk @@ -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) diff --git a/nfc/1.0/Android.mk b/nfc/1.0/Android.mk index 3ea770733c..85ce5508ae 100644 --- a/nfc/1.0/Android.mk +++ b/nfc/1.0/Android.mk @@ -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) diff --git a/radio/1.0/Android.mk b/radio/1.0/Android.mk index a71e672096..d5ba4cf263 100644 --- a/radio/1.0/Android.mk +++ b/radio/1.0/Android.mk @@ -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 (ActivityStatsInfo) @@ -3068,6 +3070,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 (ActivityStatsInfo) diff --git a/radio/1.1/Android.mk b/radio/1.1/Android.mk index b83ac8021c..a26fd5263e 100644 --- a/radio/1.1/Android.mk +++ b/radio/1.1/Android.mk @@ -16,6 +16,8 @@ LOCAL_JAVA_LIBRARIES := \ android.hardware.radio-V1.0-java \ android.hidl.base-V1.0-java \ +LOCAL_NO_STANDARD_LIBRARIES := true +LOCAL_JAVA_LIBRARIES += core-oj hwbinder # # Build types.hal (CardPowerState) @@ -381,6 +383,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android.hardware.radio-V1.0-java-static \ android.hidl.base-V1.0-java-static \ +LOCAL_NO_STANDARD_LIBRARIES := true +LOCAL_JAVA_LIBRARIES := core-oj hwbinder # # Build types.hal (CardPowerState) diff --git a/radio/deprecated/1.0/Android.mk b/radio/deprecated/1.0/Android.mk index 11377d82f2..e7516c85d2 100644 --- a/radio/deprecated/1.0/Android.mk +++ b/radio/deprecated/1.0/Android.mk @@ -16,6 +16,8 @@ LOCAL_JAVA_LIBRARIES := \ android.hardware.radio-V1.0-java \ android.hidl.base-V1.0-java \ +LOCAL_NO_STANDARD_LIBRARIES := true +LOCAL_JAVA_LIBRARIES += core-oj hwbinder # # Build IOemHook.hal @@ -94,6 +96,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android.hardware.radio-V1.0-java-static \ android.hidl.base-V1.0-java-static \ +LOCAL_NO_STANDARD_LIBRARIES := true +LOCAL_JAVA_LIBRARIES := core-oj hwbinder # # Build IOemHook.hal diff --git a/tests/baz/1.0/Android.mk b/tests/baz/1.0/Android.mk index 29874dadfa..52d6b0ce63 100644 --- a/tests/baz/1.0/Android.mk +++ b/tests/baz/1.0/Android.mk @@ -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 IBase.hal @@ -111,6 +113,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 IBase.hal diff --git a/tests/expression/1.0/Android.mk b/tests/expression/1.0/Android.mk index 1a32ef5f04..499ec3faf8 100644 --- a/tests/expression/1.0/Android.mk +++ b/tests/expression/1.0/Android.mk @@ -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 IExpression.hal @@ -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 IExpression.hal diff --git a/tests/hash/1.0/Android.mk b/tests/hash/1.0/Android.mk index 586df6e88e..cd813cb74f 100644 --- a/tests/hash/1.0/Android.mk +++ b/tests/hash/1.0/Android.mk @@ -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 IHash.hal @@ -50,6 +52,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 IHash.hal diff --git a/tests/inheritance/1.0/Android.mk b/tests/inheritance/1.0/Android.mk index 0ff9abc057..5b6ccefbcb 100644 --- a/tests/inheritance/1.0/Android.mk +++ b/tests/inheritance/1.0/Android.mk @@ -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 IChild.hal @@ -117,6 +119,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 IChild.hal diff --git a/tests/libhwbinder/1.0/Android.mk b/tests/libhwbinder/1.0/Android.mk index bb430fb6e2..c821f861e6 100644 --- a/tests/libhwbinder/1.0/Android.mk +++ b/tests/libhwbinder/1.0/Android.mk @@ -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 IBenchmark.hal @@ -69,6 +71,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 IBenchmark.hal diff --git a/tests/multithread/1.0/Android.mk b/tests/multithread/1.0/Android.mk index f63381d24c..08fd8fb6f8 100644 --- a/tests/multithread/1.0/Android.mk +++ b/tests/multithread/1.0/Android.mk @@ -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 IMultithread.hal @@ -50,6 +52,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 IMultithread.hal diff --git a/tetheroffload/control/1.0/Android.mk b/tetheroffload/control/1.0/Android.mk index 6e52c87edd..4185a6671b 100644 --- a/tetheroffload/control/1.0/Android.mk +++ b/tetheroffload/control/1.0/Android.mk @@ -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 (IPv4AddrPortPair) @@ -149,6 +151,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 (IPv4AddrPortPair) diff --git a/wifi/1.0/Android.mk b/wifi/1.0/Android.mk index 08cdcfa62d..e6ab1c4aef 100644 --- a/wifi/1.0/Android.mk +++ b/wifi/1.0/Android.mk @@ -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 (IfaceType) @@ -1894,6 +1896,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 (IfaceType) diff --git a/wifi/supplicant/1.0/Android.mk b/wifi/supplicant/1.0/Android.mk index 18c783347a..770ed884fb 100644 --- a/wifi/supplicant/1.0/Android.mk +++ b/wifi/supplicant/1.0/Android.mk @@ -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 (IfaceType) @@ -394,6 +396,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 (IfaceType)