cel-expr · copybara-service · Feb 28, 2025 · Feb 28, 2025
diff --git a/WORKSPACE b/WORKSPACE
@@ -168,9 +168,9 @@ maven_install(
 ### rules_android setup
 http_archive(
    name = "rules_android",
-    sha256 = "7dc7a6ed0b9bf53f1f363292733e3d7164e140e96ed433a2937b19570d01d517",
-    strip_prefix = "rules_android-0.6.1",
-    url = "https://github.com/bazelbuild/rules_android/releases/download/v0.6.1/rules_android-v0.6.1.tar.gz",
+    sha256 = "20d78e80007335ae83bf0de6fd7be192f7b6550857fa93734dbc287995eee756",
+    strip_prefix = "rules_android-0.6.2",
+    url = "https://github.com/bazelbuild/rules_android/releases/download/v0.6.2/rules_android-v0.6.2.tar.gz",
 )

 load("@rules_android//:prereqs.bzl", "rules_android_prereqs")

diff --git a/cel_android_library.bzl → cel_android_rules.bzl b/cel_android_library.bzl → cel_android_rules.bzl
@@ -13,7 +13,11 @@
 # limitations under the License.
 """Macro to create android_library rules with CEL specific options applied."""

-load("@rules_android//rules:rules.bzl", "android_library")
+load("@rules_android//rules:rules.bzl", "android_library", "android_local_test")
+
+DEFAULT_JAVACOPTS = [
+    "-XDstringConcat=inline",  # SDK forces usage of StringConcatFactory (java 9+)
+]

 def cel_android_library(name, **kwargs):
    """
@@ -23,15 +27,30 @@ def cel_android_library(name, **kwargs):
      name: name of the android_library target
      **kwargs: rest of the args accepted by android_library
    """
-    default_javacopts = [
-        "-XDstringConcat=inline",  # SDK forces usage of StringConcatFactory (java 9+)
-    ]

    javacopts = kwargs.get("javacopts", [])
-    all_javacopts = default_javacopts + javacopts
+    all_javacopts = DEFAULT_JAVACOPTS + javacopts

    android_library(
        name = name,
        javacopts = all_javacopts,
        **kwargs
    )
+
+def cel_android_local_test(name, **kwargs):
+    """
+    Generates android_local_test target with CEL specific javacopts applied
+
+    Args:
+      name: name of the android_local_test target
+      **kwargs: rest of the args accepted by android_local_test
+    """
+
+    javacopts = kwargs.get("javacopts", [])
+    all_javacopts = DEFAULT_JAVACOPTS + javacopts
+
+    android_local_test(
+        name = name,
+        javacopts = all_javacopts,
+        **kwargs
+    )
diff --git a/common/BUILD.bazel b/common/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@rules_java//java:defs.bzl", "java_library")
-load("//:cel_android_library.bzl", "cel_android_library")
+load("//:cel_android_rules.bzl", "cel_android_library")

 package(
    default_applicable_licenses = ["//:license"],

diff --git a/common/ast/BUILD.bazel b/common/ast/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@rules_java//java:defs.bzl", "java_library")
-load("//:cel_android_library.bzl", "cel_android_library")
+load("//:cel_android_rules.bzl", "cel_android_library")

 package(
    default_applicable_licenses = ["//:license"],

diff --git a/common/internal/BUILD.bazel b/common/internal/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@rules_java//java:defs.bzl", "java_library")
-load("//:cel_android_library.bzl", "cel_android_library")
+load("//:cel_android_rules.bzl", "cel_android_library")

 package(
    default_applicable_licenses = ["//:license"],

diff --git a/common/src/main/java/dev/cel/common/BUILD.bazel b/common/src/main/java/dev/cel/common/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@rules_java//java:defs.bzl", "java_library")
-load("//:cel_android_library.bzl", "cel_android_library")
+load("//:cel_android_rules.bzl", "cel_android_library")

 package(
    default_applicable_licenses = ["//:license"],

diff --git a/common/src/main/java/dev/cel/common/ast/BUILD.bazel b/common/src/main/java/dev/cel/common/ast/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@rules_java//java:defs.bzl", "java_library")
-load("//:cel_android_library.bzl", "cel_android_library")
+load("//:cel_android_rules.bzl", "cel_android_library")

 package(
    default_applicable_licenses = [

diff --git a/common/src/main/java/dev/cel/common/internal/BUILD.bazel b/common/src/main/java/dev/cel/common/internal/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@rules_java//java:defs.bzl", "java_library")
-load("//:cel_android_library.bzl", "cel_android_library")
+load("//:cel_android_rules.bzl", "cel_android_library")

 package(
    default_applicable_licenses = [

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,5 +1,5 @@
 load("@rules_java//java:defs.bzl", "java_library")
-load("//:cel_android_library.bzl", "cel_android_library")
+load("//:cel_android_rules.bzl", "cel_android_library")

 package(
    default_applicable_licenses = [

diff --git a/common/types/BUILD.bazel b/common/types/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@rules_java//java:defs.bzl", "java_library")
-load("//:cel_android_library.bzl", "cel_android_library")
+load("//:cel_android_rules.bzl", "cel_android_library")

 package(
    default_applicable_licenses = ["//:license"],

diff --git a/runtime/BUILD.bazel b/runtime/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@rules_java//java:defs.bzl", "java_library")
+load("//:cel_android_rules.bzl", "cel_android_library")

 package(
    default_applicable_licenses = ["//:license"],
@@ -8,10 +9,20 @@ package(
 java_library(
    name = "runtime",
    exports = [
+        ":evaluation_exception",
        "//runtime/src/main/java/dev/cel/runtime",
-        "//runtime/src/main/java/dev/cel/runtime:evaluation_exception",
+        "//runtime/src/main/java/dev/cel/runtime:descriptor_message_provider",
        "//runtime/src/main/java/dev/cel/runtime:function_overload",
        "//runtime/src/main/java/dev/cel/runtime:metadata",
+        "//runtime/src/main/java/dev/cel/runtime:runtime_type_provider",
+    ],
+)
+
+java_library(
+    name = "dispatcher",
+    visibility = ["//:internal"],
+    exports = [
+        "//runtime/src/main/java/dev/cel/runtime:dispatcher",
    ],
 )

@@ -46,8 +57,17 @@ java_library(
    ],
 )

+cel_android_library(
+    name = "function_binding_android",
+    visibility = ["//:android_allow_list"],
+    exports = [
+        "//runtime/src/main/java/dev/cel/runtime:function_binding_android",
+    ],
+)
+
 java_library(
    name = "function_overload_impl",
+    # used_by_android
    visibility = ["//:internal"],
    exports = [
        "//runtime/src/main/java/dev/cel/runtime:function_overload_impl",
@@ -59,8 +79,30 @@ java_library(
    exports = ["//runtime/src/main/java/dev/cel/runtime:evaluation_exception_builder"],
 )

+java_library(
+    name = "lite_runtime",
+    visibility = ["//:internal"],
+    exports = [
+        "//runtime/src/main/java/dev/cel/runtime:lite_runtime",
+    ],
+)
+
+java_library(
+    name = "lite_runtime_factory",
+    visibility = ["//:internal"],
+    exports = [
+        "//runtime/src/main/java/dev/cel/runtime:lite_runtime_factory",
+    ],
+)
+
+java_library(
+    name = "evaluation_exception",
+    exports = ["//runtime/src/main/java/dev/cel/runtime:evaluation_exception"],
+)
+
 java_library(
    name = "interpreter",
+    deprecation = "Please use CEL-Java Fluent APIs //runtime:runtime instead",
    exports = ["//runtime/src/main/java/dev/cel/runtime:interpreter"],
 )

@@ -114,6 +156,25 @@ java_library(
    exports = ["//runtime/src/main/java/dev/cel/runtime:evaluation_listener"],
 )

+cel_android_library(
+    name = "standard_functions_android",
+    exports = [
+        "//runtime/src/main/java/dev/cel/runtime:standard_functions_android",
+    ],
+)
+
+cel_android_library(
+    name = "lite_runtime_android",
+    visibility = ["//:android_allow_list"],
+    exports = ["//runtime/src/main/java/dev/cel/runtime:lite_runtime_android"],
+)
+
+cel_android_library(
+    name = "lite_runtime_factory_android",
+    visibility = ["//:android_allow_list"],
+    exports = ["//runtime/src/main/java/dev/cel/runtime:lite_runtime_factory_android"],
+)
+
 java_library(
    name = "base",
    exports = [