Add android BUILD targets for common/types

PiperOrigin-RevId: 726262087
google · Feb 13, 2025 · ba20bb2 · ba20bb2
1 parent 417d1fe
commit ba20bb2
Show file tree

Hide file tree

Showing 4 changed files with 96 additions and 2 deletions.
diff --git a/common/src/main/java/dev/cel/common/types/BUILD.bazel b/common/src/main/java/dev/cel/common/types/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@rules_java//java:defs.bzl", "java_library")
+load("//:cel_android_library.bzl", "cel_android_library")
 
 package(
     default_applicable_licenses = [
@@ -94,13 +95,29 @@ java_library(
     ],
 )
 
+cel_android_library(
+    name = "cel_proto_types_android",
+    srcs = ["CelProtoTypes.java"],
+    tags = [
+    ],
+    deps = [
+        ":cel_internal_types_android",
+        ":cel_types_android",
+        ":type_providers_android",
+        ":types_android",
+        "@cel_spec//proto/cel/expr:checked_java_proto_lite",
+        "@maven_android//:com_google_guava_guava",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
+    ],
+)
+
 java_library(
     name = "cel_proto_message_types",
     srcs = ["CelProtoMessageTypes.java"],
     tags = [
     ],
     deps = [
-        "//common/types:cel_proto_types",
+        ":cel_proto_types",
         "@cel_spec//proto/cel/expr:checked_java_proto",
         "@maven//:com_google_protobuf_protobuf_java",
     ],
@@ -164,3 +181,52 @@ java_library(
         "@maven//:com_google_protobuf_protobuf_java",
     ],
 )
+
+cel_android_library(
+    name = "cel_types_android",
+    srcs = ["CelTypes.java"],
+    tags = [
+    ],
+    deps = [
+        "//common/annotations",
+        "//common/types:type_providers_android",
+        "//common/types:types_android",
+        "@maven_android//:com_google_guava_guava",
+    ],
+)
+
+cel_android_library(
+    name = "type_providers_android",
+    srcs = CEL_TYPE_PROVIDER_SOURCES,
+    tags = [
+    ],
+    deps = [
+        "@maven//:com_google_errorprone_error_prone_annotations",
+        "@maven_android//:com_google_guava_guava",
+    ],
+)
+
+cel_android_library(
+    name = "types_android",
+    srcs = CEL_TYPE_SOURCES,
+    tags = [
+    ],
+    deps = [
+        ":type_providers_android",
+        "//:auto_value",
+        "//common/annotations",
+        "@maven//:com_google_errorprone_error_prone_annotations",
+        "@maven_android//:com_google_guava_guava",
+    ],
+)
+
+cel_android_library(
+    name = "cel_internal_types_android",
+    srcs = CEL_INTERNAL_TYPE_SOURCES,
+    deps = [
+        "//:auto_value",
+        "//common/annotations",
+        "//common/types:type_providers_android",
+        "@maven//:com_google_errorprone_error_prone_annotations",
+    ],
+)
diff --git a/common/src/main/java/dev/cel/common/types/EnumType.java b/common/src/main/java/dev/cel/common/types/EnumType.java
@@ -62,13 +62,15 @@ public Optional<String> findNameByNumber(Integer enumNumber) {
   /** Functional interface for lookup up an enum number by its local or fully qualified name. */
   @Immutable
   @FunctionalInterface
+  @SuppressWarnings("AndroidJdkLibsChecker") // FunctionalInterface added in 24
   public interface EnumNumberResolver {
     Optional<Integer> findNumber(String enumName);
   }
 
   /** Functional interface for looking up an enum name by its number. */
   @Immutable
   @FunctionalInterface
+  @SuppressWarnings("AndroidJdkLibsChecker") // FunctionalInterface added in 24
   public interface EnumNameResolver {
     Optional<String> findName(Integer enumNumber);
   }

diff --git a/common/src/main/java/dev/cel/common/types/StructType.java b/common/src/main/java/dev/cel/common/types/StructType.java
@@ -99,7 +99,8 @@ public static StructType create(
    */
   @Immutable
   @FunctionalInterface
-  public static interface FieldResolver {
+  @SuppressWarnings("AndroidJdkLibsChecker") // FunctionalInterface added in 24
+  public interface FieldResolver {
     /** Find the {@code CelType} for the given {@code fieldName} if the field is defined. */
     Optional<CelType> findField(String fieldName);
   }

diff --git a/common/types/BUILD.bazel b/common/types/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@rules_java//java:defs.bzl", "java_library")
+load("//:cel_android_library.bzl", "cel_android_library")
 
 package(
     default_applicable_licenses = ["//:license"],
@@ -54,3 +55,27 @@ java_library(
     visibility = ["//visibility:public"],
     exports = ["//common/src/main/java/dev/cel/common/types:cel_v1alpha1_types"],
 )
+
+cel_android_library(
+    name = "cel_types_android",
+    visibility = ["//visibility:public"],
+    exports = ["//common/src/main/java/dev/cel/common/types:cel_types_android"],
+)
+
+cel_android_library(
+    name = "types_android",
+    visibility = ["//visibility:public"],
+    exports = ["//common/src/main/java/dev/cel/common/types:types_android"],
+)
+
+cel_android_library(
+    name = "type_providers_android",
+    visibility = ["//visibility:public"],
+    exports = ["//common/src/main/java/dev/cel/common/types:type_providers_android"],
+)
+
+cel_android_library(
+    name = "cel_proto_types_android",
+    visibility = ["//visibility:public"],
+    exports = ["//common/src/main/java/dev/cel/common/types:cel_proto_types_android"],
+)