diff options
| author | Narayan Kamath <narayan@google.com> | 2018-03-02 11:34:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-03-02 11:34:28 +0000 |
| commit | 9d91a852ef09e88a3733ff7ee3450a0eed3007e3 (patch) | |
| tree | dbf5ff33dea12e8b7ef144687a1f523338d2746f | |
| parent | 846446f1d9710b7c5c232d04acb5b5d850abed32 (diff) | |
| parent | 8b0dc16195018ceca83bed57e4e8318c9a4effef (diff) | |
| download | conscrypt-9d91a852ef09e88a3733ff7ee3450a0eed3007e3.tar.gz | |
Merge "Track renaming of bouncycastle-nojarjar -> bouncycastle-unbundled." am: 2b7f3068ef
am: 8b0dc16195
Change-Id: I33c4de7f3991b5c57d123b4ecb4a7005eb7f7692
| -rw-r--r-- | Android.mk | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -77,9 +77,9 @@ LOCAL_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \ core-tests-support \ conscrypt-nojarjar \ - bouncycastle-nojarjar \ - bouncycastle-bcpkix-nojarjar \ - bouncycastle-ocsp-nojarjar + bouncycastle-unbundled \ + bouncycastle-bcpkix-unbundled \ + bouncycastle-ocsp-unbundled LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := conscrypt-tests @@ -102,9 +102,9 @@ LOCAL_JAVA_LIBRARIES := \ core-oj \ core-libart \ junit \ - bouncycastle-nojarjar \ - bouncycastle-bcpkix-nojarjar \ - bouncycastle-ocsp-nojarjar \ + bouncycastle-unbundled \ + bouncycastle-bcpkix-unbundled \ + bouncycastle-ocsp-unbundled \ caliper-api-target LOCAL_STATIC_JAVA_LIBRARIES := core-tests-support conscrypt-nojarjar LOCAL_JAVACFLAGS := $(local_javac_flags) @@ -128,9 +128,9 @@ ifeq ($(LIBCORE_SKIP_TESTS),) LOCAL_SRC_FILES := $(bundled_test_java_files) LOCAL_JAVA_RESOURCE_DIRS := openjdk/src/test/resources openjdk-integ-tests/src/test/resources LOCAL_JAVA_LIBRARIES := \ - bouncycastle-nojarjar-hostdex \ - bouncycastle-bcpkix-nojarjar-hostdex \ - bouncycastle-ocsp-nojarjar-hostdex \ + bouncycastle-unbundled-hostdex \ + bouncycastle-bcpkix-unbundled-hostdex \ + bouncycastle-ocsp-unbundled-hostdex \ junit-hostdex \ core-tests-support-hostdex \ mockito-api-hostdex |