diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-04-03 13:54:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-03 13:54:17 -0700 |
| commit | ad3f12ec91a6b419bbf4b24b619ed39bf04589ea (patch) | |
| tree | eba2b0c867bfba681df339c5f0bde93383379dfe | |
| parent | 15558fa207bb1692564c17e7e9756cdb4e0ad56c (diff) | |
| parent | befae3aad951656ca44fec38aa33fc4403c7a33e (diff) | |
| download | nist-pkits-kitkat-dev.tar.gz | |
am befae3aa: Merge "nist-pkix-tests should only depend on core and core-junit, not frameworks"android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1tools_r22.2kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devidea133-weekly-releaseidea133
* commit 'befae3aad951656ca44fec38aa33fc4403c7a33e':
nist-pkix-tests should only depend on core and core-junit, not frameworks
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -18,7 +18,9 @@ include $(CLEAR_VARS) 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_SRC_FILES := $(call all-java-files-under, src) 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) |