commit 94293086f837aa74e244d9df45ace1b557979eff
author Sundong Ahn <sundongahn@google.com> Thu Jul 13 17:03:17 2017 +0900
committer Sundong Ahn <sundongahn@google.com> Tue Aug 01 11:24:01 2017 +0900
tree c6002bb30689d4d66c0f2e623c804e210efb023c
parent 49dad304a518b162838cc4d930973698eb76a7c3

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

wifi/1.0/Android.mk

diff --git a/wifi/1.0/Android.mk b/wifi/1.0/Android.mk
index 08cdcfa..e6ab1c4 100644
--- a/wifi/1.0/Android.mk
+++ b/wifi/1.0/Android.mk
@@ -15,6 +15,8 @@
 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 @@
 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)