commit 98dcee8e690cbaa80f451e0c65eb22088165ee07
author Sundong Ahn <sundongahn@google.com> Thu Jul 13 16:30:56 2017 +0900
committer Steven Moreland <smoreland@google.com> Tue Aug 01 11:51:28 2017 -0700
tree 9eb7631df566450af2d009c45f54a6d153c36982
parent 1b8051072b233b3d18ee8511808cde9b700c0051

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: I52298dac149377abf12588ce290de00ad8cda066

transport/base/1.0/Android.mk

diff --git a/transport/base/1.0/Android.mk b/transport/base/1.0/Android.mk
index 2031a92..a044b9b 100644
--- a/transport/base/1.0/Android.mk
+++ b/transport/base/1.0/Android.mk
@@ -11,6 +11,8 @@
 intermediates := $(call local-generated-sources-dir, COMMON)
 
 HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
+LOCAL_NO_STANDARD_LIBRARIES := true
+LOCAL_JAVA_LIBRARIES := core-oj hwbinder
 
 #
 # Build types.hal (DebugInfo)
@@ -61,6 +63,8 @@
 intermediates := $(call local-generated-sources-dir, COMMON)
 
 HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
+LOCAL_NO_STANDARD_LIBRARIES := true
+LOCAL_JAVA_LIBRARIES := core-oj hwbinder
 
 #
 # Build types.hal (DebugInfo)