commit 474407820b20d627e74d0ce489b3f6a44f791cdc
author Paul Duffin <paulduffin@google.com> Thu Sep 08 11:03:34 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 08 11:03:34 2016 +0000
tree 7428887422368a4eddbcd635b3a026add465013a
parent cf8d6e32539fc3ca0d3e7ce7333eacd01a7d1284
parent 03ee9869ac7ef7cc5e6f854e09e9a8f8ff7519b3

Merge changes I150aefde,Ic6fc1807,Id82a83fd

* changes:
  Fix to CtsHostsideNetworkTestsAidl Java library kind.
  Add missing CTS keystore build dependency.
  Fix Java library dependencies

tests/cts/hostside/aidl/Android.mk

diff --git a/tests/cts/hostside/aidl/Android.mk b/tests/cts/hostside/aidl/Android.mk
index a7ec6ef..4aa55b6 100644
--- a/tests/cts/hostside/aidl/Android.mk
+++ b/tests/cts/hostside/aidl/Android.mk
@@ -19,4 +19,4 @@
 LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := com/android/cts/net/hostside/IRemoteSocketFactory.aidl
 LOCAL_MODULE := CtsHostsideNetworkTestsAidl
-include $(BUILD_JAVA_LIBRARY)
+include $(BUILD_STATIC_JAVA_LIBRARY)