Add OCSP files for testing purposes

Testing OCSP support needs some ASN.1 creation utilities. Bouncycastle
has them, but we don't want to bloat up the built-in libraries. Add some
new targets that will allow us to enable OCSP testing in the core-tests
module without spreading it elsewhere.

Change-Id: I4a75fc0d5186c70a764baa751ceab75d1a44539d

1 files changed, 92 insertions, 18 deletions

diff --git a/Android.mk b/Android.mk
index 66d5d221..6526218b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,8 +15,14 @@
 #
 LOCAL_PATH := $(call my-dir)
 
+# All the files needed for OCSP testing
+all_bc_ocsp_files := $(call all-java-files-under,bcpkix/src/main/java/org/bouncycastle/cert/ocsp) \
+ $(call all-java-files-under,bcprov/src/main/java/org/bouncycastle/asn1/ocsp)
+
 # used for bouncycastle-hostdex where we want everything for testing
-all_bcprov_src_files := $(call all-java-files-under,bcprov/src/main/java)
+all_bcprov_src_files := $(filter-out \
+ $(all_bc_ocsp_files), \
+ $(call all-java-files-under,bcprov/src/main/java))
 
 # used for bouncycastle for target where we want to be sure to use OpenSSLDigest
 android_bcprov_src_files := $(filter-out \
@@ -29,32 +35,35 @@ ri_bcprov_src_files := $(filter-out \
  bcprov/src/main/java/org/bouncycastle/crypto/digests/OpenSSLDigest.java, \
  $(all_bcprov_src_files))
 
+# used for host tools, but OCSP is only for testing
+all_bcpkix_src_files := $(filter-out \
+ $(all_bc_ocsp_files), \
+ $(call all-java-files-under,bcpkix/src/main/java))
+
 # These cannot build in the PDK, because the PDK requires all libraries
 # compile against SDK versions. LOCAL_NO_STANDARD_LIBRARIES conflicts with
 # this requirement.
 ifneq ($(TARGET_BUILD_PDK),true)
 
+    # non-jarjar version to build okhttp-tests
     include $(CLEAR_VARS)
-    LOCAL_MODULE := bouncycastle
+    LOCAL_MODULE := bouncycastle-nojarjar
     LOCAL_MODULE_TAGS := optional
     LOCAL_SRC_FILES := $(android_bcprov_src_files)
     LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt
     LOCAL_NO_STANDARD_LIBRARIES := true
-    LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
-    LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
     LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-    include $(BUILD_JAVA_LIBRARY)
+    include $(BUILD_STATIC_JAVA_LIBRARY)
 
-    # non-jarjar version to build okhttp-tests
     include $(CLEAR_VARS)
-    LOCAL_MODULE := bouncycastle-nojarjar
+    LOCAL_MODULE := bouncycastle
     LOCAL_MODULE_TAGS := optional
-    LOCAL_SRC_FILES := $(android_bcprov_src_files)
+    LOCAL_STATIC_JAVA_LIBRARIES := bouncycastle-nojarjar
     LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt
     LOCAL_NO_STANDARD_LIBRARIES := true
-    LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+    LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
     LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-    include $(BUILD_STATIC_JAVA_LIBRARY)
+    include $(BUILD_JAVA_LIBRARY)
 
     # unbundled bouncycastle jar
     include $(CLEAR_VARS)
@@ -62,8 +71,33 @@ ifneq ($(TARGET_BUILD_PDK),true)
     LOCAL_MODULE_TAGS := optional
     LOCAL_SDK_VERSION := 9
     LOCAL_SRC_FILES := $(ri_bcprov_src_files)
+    include $(BUILD_STATIC_JAVA_LIBRARY)
+
+    # PKIX classes used for testing
+    include $(CLEAR_VARS)
+    LOCAL_MODULE := bouncycastle-bcpkix-nojarjar
+    LOCAL_MODULE_TAGS := optional
+    LOCAL_SRC_FILES := $(all_bcpkix_src_files)
+    LOCAL_JAVA_LIBRARIES := bouncycastle-nojarjar
+    include $(BUILD_STATIC_JAVA_LIBRARY)
+
+    include $(CLEAR_VARS)
+    LOCAL_MODULE := bouncycastle-bcpkix
     LOCAL_MODULE_TAGS := optional
-    LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+    LOCAL_STATIC_JAVA_LIBRARIES := bouncycastle-bcpkix-nojarjar
+    # This shouldn't be necessary, but there is currently a bug in Jack where
+    # classes not in the classpath will not be renamed. b/27491842
+    LOCAL_JAVA_LIBRARIES := bouncycastle-nojarjar
+    LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
+    include $(BUILD_STATIC_JAVA_LIBRARY)
+
+    # OCSP classes used for testing
+    include $(CLEAR_VARS)
+    LOCAL_MODULE := bouncycastle-ocsp
+    LOCAL_MODULE_TAGS := optional
+    LOCAL_SRC_FILES := $(all_bc_ocsp_files)
+    LOCAL_JAVA_LIBRARIES := bouncycastle-nojarjar bouncycastle-bcpkix-nojarjar
+    LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
     LOCAL_JAVA_LANGUAGE_VERSION := 1.7
     include $(BUILD_STATIC_JAVA_LIBRARY)
 endif # TARGET_BUILD_PDK != true
@@ -113,15 +147,44 @@ bouncycastle-proguard-deadcode: $(full_classes_compiled_jar) $(full_java_libs)
 ifneq ($(TARGET_BUILD_PDK),true)
   ifeq ($(HOST_OS),linux)
     include $(CLEAR_VARS)
-    LOCAL_MODULE := bouncycastle-hostdex
+    LOCAL_MODULE := bouncycastle-hostdex-nojarjar
     LOCAL_MODULE_TAGS := optional
     LOCAL_SRC_FILES := $(all_bcprov_src_files)
+    LOCAL_JAVA_LIBRARIES := conscrypt-hostdex
+    include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
+
+    include $(CLEAR_VARS)
+    LOCAL_MODULE := bouncycastle-hostdex
     LOCAL_MODULE_TAGS := optional
+    LOCAL_STATIC_JAVA_LIBRARIES := bouncycastle-hostdex-nojarjar
     LOCAL_JAVA_LIBRARIES := conscrypt-hostdex
     LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
-    LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
     LOCAL_JAVA_LANGUAGE_VERSION := 1.7
     include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
+
+    include $(CLEAR_VARS)
+    LOCAL_MODULE := bouncycastle-bcpkix-hostdex-nojarjar
+    LOCAL_MODULE_TAGS := optional
+    LOCAL_SRC_FILES := $(all_bcpkix_src_files)
+    LOCAL_JAVA_LIBRARIES := bouncycastle-hostdex-nojarjar
+    include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
+
+    include $(CLEAR_VARS)
+    LOCAL_MODULE := bouncycastle-bcpkix-hostdex
+    LOCAL_MODULE_TAGS := optional
+    LOCAL_STATIC_JAVA_LIBRARIES := bouncycastle-bcpkix-hostdex-nojarjar
+    LOCAL_JAVA_LIBRARIES := bouncycastle-hostdex-nojarjar
+    LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
+    include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
+
+    # OCSP classes used for testing
+    include $(CLEAR_VARS)
+    LOCAL_MODULE := bouncycastle-ocsp-hostdex
+    LOCAL_MODULE_TAGS := optional
+    LOCAL_SRC_FILES := $(all_bc_ocsp_files)
+    LOCAL_JAVA_LIBRARIES := bouncycastle-hostdex-nojarjar bouncycastle-bcpkix-hostdex-nojarjar
+    LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
+    include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
   endif  # ($(HOST_OS),linux)
 endif
 
@@ -129,17 +192,28 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := bouncycastle-host
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(ri_bcprov_src_files)
-LOCAL_MODULE_TAGS := optional
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_JAVA_LANGUAGE_VERSION := 1.7
 include $(BUILD_HOST_JAVA_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := bouncycastle-bcpkix-host
 LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(call all-java-files-under,bcpkix/src/main/java)
-LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(all_bcpkix_src_files)
 LOCAL_JAVA_LIBRARIES := bouncycastle-host
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_JAVA_LANGUAGE_VERSION := 1.7
 include $(BUILD_HOST_JAVA_LIBRARY)
+
+# OCSP classes used for testing
+include $(CLEAR_VARS)
+LOCAL_MODULE := bouncycastle-ocsp-host
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(all_bc_ocsp_files)
+LOCAL_JAVA_LIBRARIES := bouncycastle-host bouncycastle-bcpkix-host
+include $(BUILD_HOST_JAVA_LIBRARY)
+
+# Unset these so they don't linger in the next makefile
+all_bcprov_src_files :=
+android_bcprov_src_files :=
+ri_bcprov_src_files :=
+all_bcpkix_src_files :=
+all_bc_ocsp_files :=