commit ad3f12ec91a6b419bbf4b24b619ed39bf04589ea
author Brian Carlstrom <bdc@google.com> Wed Apr 03 13:54:17 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 03 13:54:17 2013 -0700
tree eba2b0c867bfba681df339c5f0bde93383379dfe
parent 15558fa207bb1692564c17e7e9756cdb4e0ad56c
parent befae3aad951656ca44fec38aa33fc4403c7a33e

am befae3aa: Merge "nist-pkix-tests should only depend on core and core-junit, not frameworks"

* commit 'befae3aad951656ca44fec38aa33fc4403c7a33e':
  nist-pkix-tests should only depend on core and core-junit, not frameworks

Android.mk

diff --git a/Android.mk b/Android.mk
index 9923cce..0567baf 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,7 +18,9 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_JAVA_RESOURCE_DIRS := res
 LOCAL_MODULE := nist-pkix-tests
-LOCAL_ADDITIONAL_DEPENDENCY := $(LOCAL_PATH)/Android.mk
+LOCAL_JAVA_LIBRARIES := core core-junit
+LOCAL_NO_STANDARD_LIBRARIES := true
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -26,5 +28,5 @@
 LOCAL_JAVA_RESOURCE_DIRS := res
 LOCAL_MODULE := nist-pkix-tests-host
 LOCAL_JAVA_LIBRARIES := junit
-LOCAL_ADDITIONAL_DEPENDENCY := $(LOCAL_PATH)/Android.mk
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 include $(BUILD_HOST_JAVA_LIBRARY)