(CL 2/2) Add support for Android which needs lite protos.

This CL adds Java Android rules.

Change-Id: Ic2e3574167a200f010e8b91af5340ec8fa05c01a
ORIGINAL_AUTHOR=Thai Duong <[email protected]>
GitOrigin-RevId: 2ddc159bbe2bfd2cb4ed2cff9bc0321b9b036ec8

cc/aead/BUILD

@@ -46,9 +46,9 @@ cc_library(
         "//cc/util:status",
         "//cc/util:statusor",
         "//cc/util:validation",
-        "//proto:cc_aes_gcm",
-        "//proto:cc_common",
-        "//proto:cc_tink",
+        "//proto:aes_gcm_cc_proto",
+        "//proto:common_cc_proto",
+        "//proto:tink_cc_proto",
         "@com_github_google_protobuf//:protobuf_lite",
     ],
 )
@@ -66,7 +66,7 @@ cc_test(
         "//cc:primitive_set",
         "//cc/util:status",
         "//cc/util:test_util",
-        "//proto:cc_tink",
+        "//proto:tink_cc_proto",
         "@gtest//:gtest",
     ],
 )
@@ -82,7 +82,7 @@ cc_test(
         "//cc:crypto_format",
         "//cc/util:status",
         "//cc/util:test_util",
-        "//proto:cc_aes_gcm",
+        "//proto:aes_gcm_cc_proto",
         "@gtest//:gtest",
     ],
 )
@@ -97,10 +97,10 @@ cc_test(
         "//cc:aead",
         "//cc/util:status",
         "//cc/util:statusor",
-        "//proto:cc_aes_eax",
-        "//proto:cc_aes_gcm",
-        "//proto:cc_common",
-        "//proto:cc_tink",
+        "//proto:aes_eax_cc_proto",
+        "//proto:aes_gcm_cc_proto",
+        "//proto:common_cc_proto",
+        "//proto:tink_cc_proto",
         "@gtest//:gtest",
     ],
 )

cc/mac/BUILD

@@ -67,7 +67,7 @@ cc_test(
         "//cc:primitive_set",
         "//cc/util:status",
         "//cc/util:test_util",
-        "//proto:cc_tink",
+        "//proto:tink_cc_proto",
         "@gtest//:gtest",
     ],
 )
@@ -84,7 +84,7 @@ cc_test(
         "//cc:mac",
         "//cc/util:status",
         "//cc/util:test_util",
-        "//proto:cc_hmac",
+        "//proto:hmac_cc_proto",
         "@gtest//:gtest",
     ],
 )

cc/util/BUILD

@@ -46,7 +46,7 @@ cc_library(
         ":statusor",
         "//cc:aead",
         "//cc:mac",
-        "//proto:cc_tink",
+        "//proto:tink_cc_proto",
         "@com_github_google_protobuf//:protobuf_lite",
     ],
 )

java/BUILD

@@ -7,7 +7,7 @@ JAVACOPTS = [
     "-Xlint:deprecation",
 ]
 
-# public libraries
+# PUBLIC
 
 java_library(
     name = "java",
@@ -18,14 +18,28 @@ java_library(
         "//java/src/main/java/com/google/cloud/crypto/tink",
         "//java/src/main/java/com/google/cloud/crypto/tink/aead",
         "//java/src/main/java/com/google/cloud/crypto/tink/aead:aead_envelope",
-        "//java/src/main/java/com/google/cloud/crypto/tink/hybrid:hybriddecrypt",
-        "//java/src/main/java/com/google/cloud/crypto/tink/hybrid:hybridencrypt",
+        "//java/src/main/java/com/google/cloud/crypto/tink/hybrid:decrypt",
+        "//java/src/main/java/com/google/cloud/crypto/tink/hybrid:encrypt",
         "//java/src/main/java/com/google/cloud/crypto/tink/mac",
         "//java/src/main/java/com/google/cloud/crypto/tink/signature",
     ],
 )
 
-# restricted
+# like :java, but for Android
+java_library(
+    name = "android",
+    visibility = ["//visibility:public"],
+    exports = [
+        "//java/src/main/java/com/google/cloud/crypto/tink:android",
+        "//java/src/main/java/com/google/cloud/crypto/tink/aead:android",
+        "//java/src/main/java/com/google/cloud/crypto/tink/hybrid:decrypt_android",
+        "//java/src/main/java/com/google/cloud/crypto/tink/hybrid:encrypt_android",
+        "//java/src/main/java/com/google/cloud/crypto/tink/mac:android",
+        "//java/src/main/java/com/google/cloud/crypto/tink/signature:android",
+    ],
+)
+
+# RESTRICTED
 
 java_library(
     name = "protos",
@@ -87,9 +101,8 @@ java_library(
     ],
 )
 
-# targets for tests
+# TEST
 
-# like :java, but includes protos, restricted APIs and subtle
 java_library(
     name = "testonly",
     testonly = 1,
@@ -105,6 +118,17 @@ java_library(
     ],
 )
 
+java_library(
+    name = "testonly_android",
+    testonly = 1,
+    visibility = ["//visibility:public"],
+    exports = [
+        ":android",
+        ":subtle",
+        "//java/src/main/java/com/google/cloud/crypto/tink:keyset_handle_restricted_android",
+    ],
+)
+
 java_library(
     name = "test_util",
     testonly = 1,

java/src/main/java/com/google/cloud/crypto/tink/BUILD

@@ -80,6 +80,19 @@ java_library(
     ],
 )
 
+java_library(
+    name = "android",
+    srcs = [":tink_srcs"],
+    javacopts = JAVACOPTS,
+    deps = [
+        "//java/src/main/java/com/google/cloud/crypto/tink/subtle",
+        "//proto:common_java_proto_lite",
+        "//proto:tink_java_proto_lite",
+        "//proto:tink_java_proto_lite_compile_imports",
+        "@com_google_guava//jar",
+    ],
+)
+
 java_library(
     name = "keyset_handle_restricted",
     srcs = [
@@ -94,6 +107,20 @@ java_library(
     ],
 )
 
+java_library(
+    name = "keyset_handle_restricted_android",
+    srcs = [
+        ":keyset_handle_restricted_srcs",
+    ],
+    javacopts = JAVACOPTS,
+    deps = [
+        ":tink",
+        "//proto:common_java_proto_lite",
+        "//proto:tink_java_proto_lite",
+        "//proto:tink_java_proto_lite_compile_imports",
+    ],
+)
+
 java_library(
     name = "key_management_restricted",
     srcs = [

java/src/main/java/com/google/cloud/crypto/tink/aead/BUILD

@@ -45,6 +45,26 @@ java_library(
     ],
 )
 
+java_library(
+    name = "android",
+    srcs = [":aead_srcs"],
+    javacopts = JAVACOPTS,
+    deps = [
+        "//java/src/main/java/com/google/cloud/crypto/tink:android",
+        "//java/src/main/java/com/google/cloud/crypto/tink/mac:android",
+        "//java/src/main/java/com/google/cloud/crypto/tink/subtle",
+        "//java/src/main/java/com/google/cloud/crypto/tink/subtle:aead",
+        "//proto:aes_ctr_hmac_aead_java_proto_lite",
+        "//proto:aes_eax_java_proto_lite",
+        "//proto:aes_gcm_java_proto_lite",
+        "//proto:common_java_proto_lite",
+        "//proto:hmac_java_proto_lite",
+        "//proto:kms_envelope_java_proto_lite",
+        "//proto:tink_java_proto_lite",
+        "//proto:tink_java_proto_lite_compile_imports",
+    ],
+)
+
 java_library(
     name = "aead_envelope",
     srcs = AEAD_ENVELOPE_SRCS,

java/src/main/java/com/google/cloud/crypto/tink/hybrid/BUILD

@@ -12,7 +12,7 @@ JAVACOPTS = [
 ]
 
 filegroup(
-    name = "hybridencrypt_srcs",
+    name = "encrypt_srcs",
     srcs = [
         "EciesAeadHkdfAeadFactory.java",
         "EciesAeadHkdfHybridEncrypt.java",
@@ -23,9 +23,9 @@ filegroup(
 )
 
 java_library(
-    name = "hybridencrypt",
+    name = "encrypt",
     srcs = [
-        ":hybridencrypt_srcs",
+        ":encrypt_srcs",
     ],
     javacopts = JAVACOPTS,
     deps = [
@@ -44,8 +44,30 @@ java_library(
     ],
 )
 
+java_library(
+    name = "encrypt_android",
+    srcs = [
+        ":encrypt_srcs",
+    ],
+    javacopts = JAVACOPTS,
+    deps = [
+        "//java/src/main/java/com/google/cloud/crypto/tink:android",
+        "//java/src/main/java/com/google/cloud/crypto/tink/aead:android",
+        "//java/src/main/java/com/google/cloud/crypto/tink/mac:android",
+        "//java/src/main/java/com/google/cloud/crypto/tink/subtle",
+        "//java/src/main/java/com/google/cloud/crypto/tink/subtle:hybrid",
+        "//proto:aes_ctr_hmac_aead_java_proto_lite",
+        "//proto:aes_gcm_java_proto_lite",
+        "//proto:common_java_proto_lite",
+        "//proto:ecies_aead_hkdf_java_proto_lite",
+        "//proto:hmac_java_proto_lite",
+        "//proto:tink_java_proto_lite",
+        "//proto:tink_java_proto_lite_compile_imports",
+    ],
+)
+
 filegroup(
-    name = "hybriddecrypt_srcs",
+    name = "decrypt_srcs",
     srcs = [
         "EciesAeadHkdfAeadFactory.java",
         "EciesAeadHkdfHybridDecrypt.java",
@@ -56,9 +78,9 @@ filegroup(
 )
 
 java_library(
-    name = "hybriddecrypt",
+    name = "decrypt",
     srcs = [
-        ":hybriddecrypt_srcs",
+        ":decrypt_srcs",
     ],
     javacopts = JAVACOPTS,
     deps = [
@@ -76,3 +98,25 @@ java_library(
         "//proto:tink_java_proto_compile_imports",
     ],
 )
+
+java_library(
+    name = "decrypt_android",
+    srcs = [
+        ":decrypt_srcs",
+    ],
+    javacopts = JAVACOPTS,
+    deps = [
+        "//java/src/main/java/com/google/cloud/crypto/tink:android",
+        "//java/src/main/java/com/google/cloud/crypto/tink/aead:android",
+        "//java/src/main/java/com/google/cloud/crypto/tink/mac:android",
+        "//java/src/main/java/com/google/cloud/crypto/tink/subtle",
+        "//java/src/main/java/com/google/cloud/crypto/tink/subtle:hybrid",
+        "//proto:aes_ctr_hmac_aead_java_proto_lite",
+        "//proto:aes_gcm_java_proto_lite",
+        "//proto:common_java_proto_lite",
+        "//proto:ecies_aead_hkdf_java_proto_lite",
+        "//proto:hmac_java_proto_lite",
+        "//proto:tink_java_proto_lite",
+        "//proto:tink_java_proto_lite_compile_imports",
+    ],
+)

java/src/main/java/com/google/cloud/crypto/tink/mac/BUILD

@@ -34,3 +34,18 @@ java_library(
         "//proto:tink_java_proto_compile_imports",
     ],
 )
+
+java_library(
+    name = "android",
+    srcs = [":mac_srcs"],
+    javacopts = JAVACOPTS,
+    deps = [
+        "//java/src/main/java/com/google/cloud/crypto/tink",
+        "//java/src/main/java/com/google/cloud/crypto/tink/subtle",
+        "//java/src/main/java/com/google/cloud/crypto/tink/subtle:mac",
+        "//proto:common_java_proto_lite",
+        "//proto:hmac_java_proto_lite",
+        "//proto:tink_java_proto_lite",
+        "//proto:tink_java_proto_lite_compile_imports",
+    ],
+)

java/src/main/java/com/google/cloud/crypto/tink/signature/BUILD

@@ -34,3 +34,18 @@ java_library(
         "//proto:tink_java_proto_compile_imports",
     ],
 )
+
+java_library(
+    name = "android",
+    srcs = [":signature_srcs"],
+    javacopts = JAVACOPTS,
+    deps = [
+        "//java/src/main/java/com/google/cloud/crypto/tink",
+        "//java/src/main/java/com/google/cloud/crypto/tink/subtle",
+        "//java/src/main/java/com/google/cloud/crypto/tink/subtle:signature",
+        "//proto:common_java_proto_lite",
+        "//proto:ecdsa_java_proto_lite",
+        "//proto:tink_java_proto_lite",
+        "//proto:tink_java_proto_lite_compile_imports",
+    ],
+)