Skip to content
Snippets Groups Projects
Commit 0d11c2de authored by Thai Duong's avatar Thai Duong
Browse files

Add a Bazel config_setting that allows to enable Java full protos. 

Because Tinkey depends on full protos, Tink for Java had provided two
flavors for every target that depends on protos. Since this new setting
allows users to dynamically select which protos they want to build Tink
with, Tink will default to lite protos and users that need full protos
(e.g., to build Tinkey) can build Tink with:

bazel build ... --define use_java_proto_full=true

Change-Id: I42c9589d96269e969f671ecc20e6578c73bda7ce
ORIGINAL_AUTHOR=Thai Duong <thaidn@google.com>
GitOrigin-RevId: 1404cfdeb3fe9c4e1c120eb5c9e57532c1c0cfa1
parent 129c333d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 221 additions and 260 deletions
java/BUILD
+ 51
− 40
View file @ 0d11c2de
...@@ -25,12 +25,12 @@ java_library( ...@@ -25,12 +25,12 @@ java_library(
name = "android", name = "android",
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
exports = [ exports = [
"//java/src/main/java/com/google/crypto/tink:android", "//java/src/main/java/com/google/crypto/tink",
"//java/src/main/java/com/google/crypto/tink/aead:android", "//java/src/main/java/com/google/crypto/tink/aead",
"//java/src/main/java/com/google/crypto/tink/hybrid:android", "//java/src/main/java/com/google/crypto/tink/hybrid",
"//java/src/main/java/com/google/crypto/tink/mac:android", "//java/src/main/java/com/google/crypto/tink/mac",
"//java/src/main/java/com/google/crypto/tink/signature:android", "//java/src/main/java/com/google/crypto/tink/signature",
"//java/src/main/java/com/google/crypto/tink/streamingaead:android", "//java/src/main/java/com/google/crypto/tink/streamingaead",
], ],
) )
...@@ -48,44 +48,54 @@ java_library( ...@@ -48,44 +48,54 @@ java_library(
], ],
) )
java_library(
name = "subtle_android",
visibility = ["//visibility:public"],
exports = [
"//java/src/main/java/com/google/crypto/tink/subtle",
"//java/src/main/java/com/google/crypto/tink/subtle:aead",
"//java/src/main/java/com/google/crypto/tink/subtle:hybrid_android",
"//java/src/main/java/com/google/crypto/tink/subtle:mac",
"//java/src/main/java/com/google/crypto/tink/subtle:signature_android",
"//java/src/main/java/com/google/crypto/tink/subtle:x25519",
],
)
# RESTRICTED # RESTRICTED
FULL_PROTOS = [
"//proto:aes_ctr_hmac_aead_java_proto",
"//proto:aes_ctr_hmac_streaming_java_proto",
"//proto:aes_ctr_java_proto",
"//proto:aes_eax_java_proto",
"//proto:aes_gcm_hkdf_streaming_java_proto",
"//proto:aes_gcm_java_proto",
"//proto:chacha20_poly1305_java_proto",
"//proto:common_java_proto",
"//proto:ecdsa_java_proto",
"//proto:ecies_aead_hkdf_java_proto",
"//proto:ed25519_java_proto",
"//proto:hmac_java_proto",
"//proto:kms_aead_java_proto",
"//proto:kms_envelope_java_proto",
"//proto:tink_java_proto",
]
LITE_PROTOS = [
"//proto:aes_ctr_hmac_aead_java_proto_lite",
"//proto:aes_ctr_hmac_streaming_java_proto_lite",
"//proto:aes_ctr_java_proto_lite",
"//proto:aes_eax_java_proto_lite",
"//proto:aes_gcm_hkdf_streaming_java_proto_lite",
"//proto:aes_gcm_java_proto_lite",
"//proto:chacha20_poly1305_java_proto_lite",
"//proto:common_java_proto_lite",
"//proto:ecdsa_java_proto_lite",
"//proto:ecies_aead_hkdf_java_proto_lite",
"//proto:ed25519_java_proto_lite",
"//proto:hmac_java_proto_lite",
"//proto:kms_aead_java_proto_lite",
"//proto:kms_envelope_java_proto_lite",
"//proto:tink_java_proto_lite",
]
java_library( java_library(
name = "protos", name = "protos",
visibility = [ visibility = [
"//examples/java/envelopeme:__pkg__", "//examples/java/envelopeme:__pkg__",
"//tools/tinkey:__pkg__", "//tools/tinkey:__pkg__",
], ],
exports = [ exports = select({
"//proto:aes_ctr_hmac_aead_java_proto", "//java/build_defs:use_java_proto_full": FULL_PROTOS,
"//proto:aes_ctr_hmac_streaming_java_proto", "//conditions:default": LITE_PROTOS,
"//proto:aes_ctr_java_proto", }),
"//proto:aes_eax_java_proto",
"//proto:aes_gcm_hkdf_streaming_java_proto",
"//proto:aes_gcm_java_proto",
"//proto:chacha20_poly1305_java_proto",
"//proto:common_java_proto",
"//proto:ecdsa_java_proto",
"//proto:ecies_aead_hkdf_java_proto",
"//proto:ed25519_java_proto",
"//proto:hmac_java_proto",
"//proto:kms_aead_java_proto",
"//proto:kms_envelope_java_proto",
"//proto:tink_java_proto",
],
) )
java_library( java_library(
...@@ -121,8 +131,9 @@ java_library( ...@@ -121,8 +131,9 @@ java_library(
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
exports = [ exports = [
":android", ":android",
":subtle_android", ":keyset_handle",
"//java/src/main/java/com/google/crypto/tink:keyset_handle_android", ":protos",
":subtle",
], ],
) )
...@@ -138,7 +149,7 @@ java_library( ...@@ -138,7 +149,7 @@ java_library(
deps = [ deps = [
":testonly", ":testonly",
"@com_google_guava//jar", "@com_google_guava//jar",
"@com_google_protobuf_java//:protobuf_java", "@com_google_protobuf_javalite//:protobuf_java_lite",
"@junit_junit_4//jar", "@junit_junit_4//jar",
], ],
) )
...@@ -167,7 +178,7 @@ java_library( ...@@ -167,7 +178,7 @@ java_library(
"@com_fasterxml_jackson_core//jar", "@com_fasterxml_jackson_core//jar",
"@com_google_api_client//jar", "@com_google_api_client//jar",
"@com_google_guava//jar", "@com_google_guava//jar",
"@com_google_protobuf_java//:protobuf_java", "@com_google_protobuf_javalite//:protobuf_java_lite",
"@com_google_truth//jar", "@com_google_truth//jar",
"@junit_junit_4//jar", "@junit_junit_4//jar",
"@org_mockito//jar", "@org_mockito//jar",
......
java/build_defs/BUILD
+ 10
− 0
View file @ 0d11c2de
licenses(["notice"]) # Apache 2.0 licenses(["notice"]) # Apache 2.0
# Blaze config for enabling Datalab functionality in the Colab build.
config_setting(
name = "use_java_proto_full",
values = {"define": "use_java_proto_full=true"},
visibility = [
"//java:__subpackages__",
"//tools/tinkey:__subpackages__",
],
)
java/src/main/java/com/google/crypto/tink/BUILD
+ 19
− 34
View file @ 0d11c2de
...@@ -8,6 +8,16 @@ package( ...@@ -8,6 +8,16 @@ package(
load("//java/build_defs:javac.bzl", "JAVACOPTS") load("//java/build_defs:javac.bzl", "JAVACOPTS")
FULL_PROTOS = [
"//proto:common_java_proto",
"//proto:tink_java_proto",
]
LITE_PROTOS = [
"//proto:common_java_proto_lite",
"//proto:tink_java_proto_lite",
]
# public interfaces # public interfaces
java_library( java_library(
...@@ -57,24 +67,12 @@ java_library( ...@@ -57,24 +67,12 @@ java_library(
javacopts = JAVACOPTS, javacopts = JAVACOPTS,
deps = [ deps = [
"//java/src/main/java/com/google/crypto/tink/subtle", "//java/src/main/java/com/google/crypto/tink/subtle",
"//proto:common_java_proto",
"//proto:tink_java_proto",
"@com_google_errorprone_error_prone_annotations//jar", "@com_google_errorprone_error_prone_annotations//jar",
"@com_google_protobuf_java//:protobuf_java", "@com_google_protobuf_javalite//:protobuf_java_lite",
], ] + select({
) "//java/build_defs:use_java_proto_full": FULL_PROTOS,
"//conditions:default": LITE_PROTOS,
java_library( }),
name = "android",
srcs = [":tink_srcs"],
javacopts = JAVACOPTS,
deps = [
"//java/src/main/java/com/google/crypto/tink/subtle",
"//proto:common_java_proto_lite",
"//proto:tink_java_proto_lite",
"@com_google_errorprone_error_prone_annotations//jar",
"@com_google_protobuf_java//:protobuf_java",
],
) )
java_library( java_library(
...@@ -85,22 +83,9 @@ java_library( ...@@ -85,22 +83,9 @@ java_library(
javacopts = JAVACOPTS, javacopts = JAVACOPTS,
deps = [ deps = [
":tink", ":tink",
"//proto:common_java_proto",
"//proto:tink_java_proto",
"@com_google_protobuf_java//:protobuf_java", "@com_google_protobuf_java//:protobuf_java",
], ] + select({
) "//java/build_defs:use_java_proto_full": FULL_PROTOS,
"//conditions:default": LITE_PROTOS,
java_library( }),
name = "keyset_handle_android",
srcs = [
":keyset_handle_srcs",
],
javacopts = JAVACOPTS,
deps = [
":android",
"//proto:common_java_proto_lite",
"//proto:tink_java_proto_lite",
"@com_google_protobuf_java//:protobuf_java",
],
) )
java/src/main/java/com/google/crypto/tink/aead/BUILD
+ 31
− 35
View file @ 0d11c2de
...@@ -17,6 +17,32 @@ filegroup( ...@@ -17,6 +17,32 @@ filegroup(
), ),
) )
FULL_PROTOS = [
"//proto:aes_ctr_hmac_aead_java_proto",
"//proto:aes_ctr_java_proto",
"//proto:aes_eax_java_proto",
"//proto:aes_gcm_java_proto",
"//proto:chacha20_poly1305_java_proto",
"//proto:common_java_proto",
"//proto:hmac_java_proto",
"//proto:kms_aead_java_proto",
"//proto:kms_envelope_java_proto",
"//proto:tink_java_proto",
]
LITE_PROTOS = [
"//proto:aes_ctr_hmac_aead_java_proto_lite",
"//proto:aes_ctr_java_proto_lite",
"//proto:aes_eax_java_proto_lite",
"//proto:aes_gcm_java_proto_lite",
"//proto:chacha20_poly1305_java_proto_lite",
"//proto:common_java_proto_lite",
"//proto:hmac_java_proto_lite",
"//proto:kms_aead_java_proto_lite",
"//proto:kms_envelope_java_proto_lite",
"//proto:tink_java_proto_lite",
]
java_library( java_library(
name = "aead", name = "aead",
srcs = [":aead_srcs"], srcs = [":aead_srcs"],
...@@ -26,39 +52,9 @@ java_library( ...@@ -26,39 +52,9 @@ java_library(
"//java/src/main/java/com/google/crypto/tink/mac", "//java/src/main/java/com/google/crypto/tink/mac",
"//java/src/main/java/com/google/crypto/tink/subtle", "//java/src/main/java/com/google/crypto/tink/subtle",
"//java/src/main/java/com/google/crypto/tink/subtle:aead", "//java/src/main/java/com/google/crypto/tink/subtle:aead",
"//proto:aes_ctr_hmac_aead_java_proto", "@com_google_protobuf_javalite//:protobuf_java_lite",
"//proto:aes_ctr_java_proto", ] + select({
"//proto:aes_eax_java_proto", "//java/build_defs:use_java_proto_full": FULL_PROTOS,
"//proto:aes_gcm_java_proto", "//conditions:default": LITE_PROTOS,
"//proto:chacha20_poly1305_java_proto", }),
"//proto:common_java_proto",
"//proto:hmac_java_proto",
"//proto:kms_aead_java_proto",
"//proto:kms_envelope_java_proto",
"//proto:tink_java_proto",
"@com_google_protobuf_java//:protobuf_java",
],
)
java_library(
name = "android",
srcs = [":aead_srcs"],
javacopts = JAVACOPTS,
deps = [
"//java/src/main/java/com/google/crypto/tink:android",
"//java/src/main/java/com/google/crypto/tink/mac:android",
"//java/src/main/java/com/google/crypto/tink/subtle",
"//java/src/main/java/com/google/crypto/tink/subtle:aead",
"//proto:aes_ctr_hmac_aead_java_proto_lite",
"//proto:aes_ctr_java_proto_lite",
"//proto:aes_eax_java_proto_lite",
"//proto:aes_gcm_java_proto_lite",
"//proto:chacha20_poly1305_java_proto_lite",
"//proto:common_java_proto_lite",
"//proto:hmac_java_proto_lite",
"//proto:kms_aead_java_proto_lite",
"//proto:kms_envelope_java_proto_lite",
"//proto:tink_java_proto_lite",
"@com_google_protobuf_java//:protobuf_java",
],
) )
java/src/main/java/com/google/crypto/tink/hybrid/BUILD
+ 25
− 32
View file @ 0d11c2de
...@@ -17,6 +17,26 @@ filegroup( ...@@ -17,6 +17,26 @@ filegroup(
), ),
) )
FULL_PROTOS = [
"//proto:aes_ctr_hmac_aead_java_proto",
"//proto:aes_ctr_java_proto",
"//proto:aes_gcm_java_proto",
"//proto:common_java_proto",
"//proto:ecies_aead_hkdf_java_proto",
"//proto:hmac_java_proto",
"//proto:tink_java_proto",
]
LITE_PROTOS = [
"//proto:aes_ctr_hmac_aead_java_proto_lite",
"//proto:aes_ctr_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",
]
java_library( java_library(
name = "hybrid", name = "hybrid",
srcs = [ srcs = [
...@@ -29,36 +49,9 @@ java_library( ...@@ -29,36 +49,9 @@ java_library(
"//java/src/main/java/com/google/crypto/tink/mac", "//java/src/main/java/com/google/crypto/tink/mac",
"//java/src/main/java/com/google/crypto/tink/subtle", "//java/src/main/java/com/google/crypto/tink/subtle",
"//java/src/main/java/com/google/crypto/tink/subtle:hybrid", "//java/src/main/java/com/google/crypto/tink/subtle:hybrid",
"//proto:aes_ctr_hmac_aead_java_proto", "@com_google_protobuf_javalite//:protobuf_java_lite",
"//proto:aes_ctr_java_proto", ] + select({
"//proto:aes_gcm_java_proto", "//java/build_defs:use_java_proto_full": FULL_PROTOS,
"//proto:common_java_proto", "//conditions:default": LITE_PROTOS,
"//proto:ecies_aead_hkdf_java_proto", }),
"//proto:hmac_java_proto",
"//proto:tink_java_proto",
"@com_google_protobuf_java//:protobuf_java",
],
)
java_library(
name = "android",
srcs = [
":hybrid_srcs",
],
javacopts = JAVACOPTS,
deps = [
"//java/src/main/java/com/google/crypto/tink:android",
"//java/src/main/java/com/google/crypto/tink/aead:android",
"//java/src/main/java/com/google/crypto/tink/mac:android",
"//java/src/main/java/com/google/crypto/tink/subtle",
"//java/src/main/java/com/google/crypto/tink/subtle:hybrid_android",
"//proto:aes_ctr_hmac_aead_java_proto_lite",
"//proto:aes_ctr_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",
"@com_google_protobuf_java//:protobuf_java",
],
) )
java/src/main/java/com/google/crypto/tink/mac/BUILD
+ 17
− 20
View file @ 0d11c2de
...@@ -17,32 +17,29 @@ filegroup( ...@@ -17,32 +17,29 @@ filegroup(
), ),
) )
java_library( FULL_PROTOS = [
name = "mac", "//proto:common_java_proto",
srcs = [":mac_srcs"], "//proto:hmac_java_proto",
javacopts = JAVACOPTS, "//proto:tink_java_proto",
deps = [ ]
"//java/src/main/java/com/google/crypto/tink",
"//java/src/main/java/com/google/crypto/tink/subtle", LITE_PROTOS = [
"//java/src/main/java/com/google/crypto/tink/subtle:mac", "//proto:common_java_proto_lite",
"//proto:common_java_proto", "//proto:hmac_java_proto_lite",
"//proto:hmac_java_proto", "//proto:tink_java_proto_lite",
"//proto:tink_java_proto", ]
"@com_google_protobuf_java//:protobuf_java",
],
)
java_library( java_library(
name = "android", name = "mac",
srcs = [":mac_srcs"], srcs = [":mac_srcs"],
javacopts = JAVACOPTS, javacopts = JAVACOPTS,
deps = [ deps = [
"//java/src/main/java/com/google/crypto/tink", "//java/src/main/java/com/google/crypto/tink",
"//java/src/main/java/com/google/crypto/tink/subtle", "//java/src/main/java/com/google/crypto/tink/subtle",
"//java/src/main/java/com/google/crypto/tink/subtle:mac", "//java/src/main/java/com/google/crypto/tink/subtle:mac",
"//proto:common_java_proto_lite", "@com_google_protobuf_javalite//:protobuf_java_lite",
"//proto:hmac_java_proto_lite", ] + select({
"//proto:tink_java_proto_lite", "//java/build_defs:use_java_proto_full": FULL_PROTOS,
"@com_google_protobuf_java//:protobuf_java", "//conditions:default": LITE_PROTOS,
], }),
) )
java/src/main/java/com/google/crypto/tink/signature/BUILD
+ 19
− 22
View file @ 0d11c2de
...@@ -17,6 +17,20 @@ filegroup( ...@@ -17,6 +17,20 @@ filegroup(
), ),
) )
FULL_PROTOS = [
"//proto:common_java_proto",
"//proto:ecdsa_java_proto",
"//proto:ed25519_java_proto",
"//proto:tink_java_proto",
]
LITE_PROTOS = [
"//proto:common_java_proto_lite",
"//proto:ecdsa_java_proto_lite",
"//proto:ed25519_java_proto_lite",
"//proto:tink_java_proto_lite",
]
java_library( java_library(
name = "signature", name = "signature",
srcs = [":signature_srcs"], srcs = [":signature_srcs"],
...@@ -25,26 +39,9 @@ java_library( ...@@ -25,26 +39,9 @@ java_library(
"//java/src/main/java/com/google/crypto/tink", "//java/src/main/java/com/google/crypto/tink",
"//java/src/main/java/com/google/crypto/tink/subtle", "//java/src/main/java/com/google/crypto/tink/subtle",
"//java/src/main/java/com/google/crypto/tink/subtle:signature", "//java/src/main/java/com/google/crypto/tink/subtle:signature",
"//proto:common_java_proto", "@com_google_protobuf_javalite//:protobuf_java_lite",
"//proto:ecdsa_java_proto", ] + select({
"//proto:ed25519_java_proto", "//java/build_defs:use_java_proto_full": FULL_PROTOS,
"//proto:tink_java_proto", "//conditions:default": LITE_PROTOS,
"@com_google_protobuf_java//:protobuf_java", }),
],
)
java_library(
name = "android",
srcs = [":signature_srcs"],
javacopts = JAVACOPTS,
deps = [
"//java/src/main/java/com/google/crypto/tink:android",
"//java/src/main/java/com/google/crypto/tink/subtle",
"//java/src/main/java/com/google/crypto/tink/subtle:signature_android",
"//proto:common_java_proto_lite",
"//proto:ecdsa_java_proto_lite",
"//proto:ed25519_java_proto_lite",
"//proto:tink_java_proto_lite",
"@com_google_protobuf_java//:protobuf_java",
],
) )
java/src/main/java/com/google/crypto/tink/streamingaead/BUILD
+ 19
− 22
View file @ 0d11c2de
...@@ -17,6 +17,20 @@ filegroup( ...@@ -17,6 +17,20 @@ filegroup(
), ),
) )
FULL_PROTOS = [
"//proto:aes_ctr_hmac_streaming_java_proto",
"//proto:aes_gcm_hkdf_streaming_java_proto",
"//proto:common_java_proto",
"//proto:tink_java_proto",
]
LITE_PROTOS = [
"//proto:aes_ctr_hmac_streaming_java_proto_lite",
"//proto:aes_gcm_hkdf_streaming_java_proto_lite",
"//proto:common_java_proto_lite",
"//proto:tink_java_proto_lite",
]
java_library( java_library(
name = "streamingaead", name = "streamingaead",
srcs = [":streamingaead_srcs"], srcs = [":streamingaead_srcs"],
...@@ -25,26 +39,9 @@ java_library( ...@@ -25,26 +39,9 @@ java_library(
"//java/src/main/java/com/google/crypto/tink", "//java/src/main/java/com/google/crypto/tink",
"//java/src/main/java/com/google/crypto/tink/subtle", "//java/src/main/java/com/google/crypto/tink/subtle",
"//java/src/main/java/com/google/crypto/tink/subtle:streaming", "//java/src/main/java/com/google/crypto/tink/subtle:streaming",
"//proto:aes_ctr_hmac_streaming_java_proto", "@com_google_protobuf_javalite//:protobuf_java_lite",
"//proto:aes_gcm_hkdf_streaming_java_proto", ] + select({
"//proto:common_java_proto", "//java/build_defs:use_java_proto_full": FULL_PROTOS,
"//proto:tink_java_proto", "//conditions:default": LITE_PROTOS,
"@com_google_protobuf_java//:protobuf_java", }),
],
)
java_library(
name = "android",
srcs = [":streamingaead_srcs"],
javacopts = JAVACOPTS,
deps = [
"//java/src/main/java/com/google/crypto/tink:android",
"//java/src/main/java/com/google/crypto/tink/subtle",
"//java/src/main/java/com/google/crypto/tink/subtle:streaming",
"//proto:aes_ctr_hmac_streaming_java_proto_lite",
"//proto:aes_gcm_hkdf_streaming_java_proto_lite",
"//proto:common_java_proto_lite",
"//proto:tink_java_proto_lite",
"@com_google_protobuf_java//:protobuf_java",
],
) )
java/src/main/java/com/google/crypto/tink/subtle/BUILD
+ 16
− 45
View file @ 0d11c2de
...@@ -8,6 +8,14 @@ package( ...@@ -8,6 +8,14 @@ package(
load("//java/build_defs:javac.bzl", "JAVACOPTS") load("//java/build_defs:javac.bzl", "JAVACOPTS")
FULL_PROTOS = [
"//proto:common_java_proto",
]
LITE_PROTOS = [
"//proto:common_java_proto_lite",
]
# common subtle # common subtle
java_library( java_library(
...@@ -78,29 +86,11 @@ java_library( ...@@ -78,29 +86,11 @@ java_library(
":subtle", ":subtle",
":x25519", ":x25519",
"//java/src/main/java/com/google/crypto/tink:primitives", "//java/src/main/java/com/google/crypto/tink:primitives",
"//proto:common_java_proto",
"@com_google_errorprone_error_prone_annotations//jar", "@com_google_errorprone_error_prone_annotations//jar",
], ] + select({
) "//java/build_defs:use_java_proto_full": FULL_PROTOS,
"//conditions:default": LITE_PROTOS,
java_library( }),
name = "signature_android",
srcs = [
"EcUtil.java",
"EcdsaSignJce.java",
"EcdsaVerifyJce.java",
"Ed25519Sign.java",
"Ed25519Verify.java",
],
javacopts = JAVACOPTS,
deps = [
":ed25519_internal",
":subtle",
":x25519",
"//java/src/main/java/com/google/crypto/tink:primitives",
"//proto:common_java_proto_lite",
"@com_google_errorprone_error_prone_annotations//jar",
],
) )
# hybrid subtle # hybrid subtle
...@@ -124,30 +114,11 @@ java_library( ...@@ -124,30 +114,11 @@ java_library(
":subtle", ":subtle",
":x25519", ":x25519",
"//java/src/main/java/com/google/crypto/tink:primitives", "//java/src/main/java/com/google/crypto/tink:primitives",
"//proto:common_java_proto",
"@com_google_errorprone_error_prone_annotations//jar", "@com_google_errorprone_error_prone_annotations//jar",
], ] + select({
) "//java/build_defs:use_java_proto_full": FULL_PROTOS,
"//conditions:default": LITE_PROTOS,
java_library( }),
name = "hybrid_android",
srcs = [
"EcUtil.java",
"EciesAeadHkdfDemHelper.java",
"EciesAeadHkdfHybridDecrypt.java",
"EciesAeadHkdfHybridEncrypt.java",
"EciesHkdfRecipientKem.java",
"EciesHkdfSenderKem.java",
"Hkdf.java",
"ProtoUtil.java",
],
javacopts = JAVACOPTS,
deps = [
":subtle",
"//java/src/main/java/com/google/crypto/tink:primitives",
"//proto:common_java_proto_lite",
"@com_google_errorprone_error_prone_annotations//jar",
],
) )
# Streaming # Streaming
......
kokoro/gcp_ubuntu/presubmit.sh
+ 6
− 3
View file @ 0d11c2de
...@@ -31,7 +31,10 @@ cd github/tink/ ...@@ -31,7 +31,10 @@ cd github/tink/
bazel build --strategy=CppCompile=standalone --strategy=Turbine=standalone \ bazel build --strategy=CppCompile=standalone --strategy=Turbine=standalone \
--strategy=ProtoCompile=standalone --strategy=GenProto=standalone \ --strategy=ProtoCompile=standalone --strategy=GenProto=standalone \
--strategy=GenRule=standalone --strategy=GenProtoDescriptorSet=standalone \ --strategy=GenRule=standalone --strategy=GenProtoDescriptorSet=standalone \
--sandbox_tmpfs_path=$TMP -- //... -//objc/... --sandbox_tmpfs_path=$TMP -- //... -//objc/... -//tools/...
# Run all tests. # Run all tests, except Tinkey and iOS.
bazel test --strategy=TestRunner=standalone --test_output=all -- //... -//objc/... bazel test --strategy=TestRunner=standalone --test_output=all -- //... -//objc/... -//tools/...
# Run Tinkey tests, with full protos.
bazel test --strategy=TestRunner=standalone --test_output=all --define use_java_proto_full=true -- //tools/... -//objc/...
kokoro/macos_external/presubmit.sh
+ 8
− 7
View file @ 0d11c2de
...@@ -54,8 +54,8 @@ ${BAZEL_BIN} version ...@@ -54,8 +54,8 @@ ${BAZEL_BIN} version
echo "using java binary: " `which java` echo "using java binary: " `which java`
java -version java -version
# Build the iOS targets. # Test the iOS targets.
${BAZEL_BIN} build \ ${BAZEL_BIN} test \
$DISABLE_SANDBOX \ $DISABLE_SANDBOX \
--compilation_mode=dbg \ --compilation_mode=dbg \
--dynamic_mode=off \ --dynamic_mode=off \
...@@ -71,11 +71,12 @@ ${BAZEL_BIN} build \ ...@@ -71,11 +71,12 @@ ${BAZEL_BIN} build \
echo "bazel obj-c passed" echo "bazel obj-c passed"
# Build all targets except iOS. # Test all targets except Tinkey and iOS.
# bazel sandbox doesn't work with Kokoro's MacOS image, see b/38040081. # bazel sandbox doesn't work with Kokoro's MacOS image, see b/38040081.
${BAZEL_BIN} build --sandbox_tmpfs_path=$TMP $DISABLE_SANDBOX -- //... -//objc/... || ( ls -l ; df -h / ; exit 1 ) ${BAZEL_BIN} test --sandbox_tmpfs_path=$TMP $DISABLE_SANDBOX -- //... -//objc/... -//tools/... || ( ls -l ; df -h / ; exit 1 )
echo "bazel c++ / java passed" # Run all Tinkey tests, with full protos.
${BAZEL_BIN} test --sandbox_tmpfs_path=$TMP --strategy=TestRunner=standalone --test_output=all \
--define use_java_proto_full=true -- //tools/... -//objc/...
# Run all non-iOS tests. echo "bazel non objc-c passed"
${BAZEL_BIN} test --sandbox_tmpfs_path=$TMP --strategy=TestRunner=standalone --test_output=all -- //... -//objc/...
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment