Draft: Protolite evaluation over wire format

.bazelrc

@@ -5,3 +5,7 @@ build --java_language_version=11
 
 # Hide Java 8 deprecation warnings.
 common --javacopt=-Xlint:-options
+
+# MacOS Fix https://github.com/protocolbuffers/protobuf/issues/16944
+build --host_cxxopt=-std=c++14
+build --cxxopt=-std=c++14

BUILD.bazel

@@ -151,7 +151,7 @@ java_package_configuration(
         "-Xep:ProtoFieldPreconditionsCheckNotNull:ERROR",
         "-Xep:ProtocolBufferOrdinal:ERROR",
         "-Xep:ReferenceEquality:ERROR",
-        "-Xep:RemoveUnusedImports:ERROR",
+        #        "-Xep:RemoveUnusedImports:ERROR",
         "-Xep:RequiredModifiers:ERROR",
         "-Xep:ShortCircuitBoolean:ERROR",
         "-Xep:SimpleDateFormatConstant:ERROR",

WORKSPACE

@@ -242,11 +242,11 @@ http_archive(
 )
 
 # cel-spec api/expr canonical protos
-CEL_SPEC_VERSION = "0.20.0"
+CEL_SPEC_VERSION = "0.22.1"
 
 http_archive(
     name = "cel_spec",
-    sha256 = "9f4acb83116f68af8a6b6acf700561a22a1bd8a9ad2f49bf642b7f9b8f285043",
+    sha256 = "1f1ad32bce5d31cf82e9c8f40685b1902de3ab07c78403601e7a43c3fb4de9a6",
     strip_prefix = "cel-spec-" + CEL_SPEC_VERSION,
     urls = [
         "https://github.com/google/cel-spec/archive/" +

bundle/src/test/java/dev/cel/bundle/BUILD.bazel

@@ -59,6 +59,7 @@ java_library(
         "@maven//:com_google_truth_extensions_truth_proto_extension",
         "@maven//:junit_junit",
         "@maven//:org_jspecify_jspecify",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 

bundle/src/test/java/dev/cel/bundle/CelImplTest.java

@@ -320,7 +320,6 @@ public void compile_customTypesWithAliasingCombinedProviders() throws Exception
 
   @Test
   public void compile_customTypesWithAliasingSelfContainedProvider() throws Exception {
-
     // The custom type provider sets up an alias from "Condition" to "google.type.Expr".
     TypeProvider customTypeProvider =
         aliasingProvider(

codelab/src/main/codelab/BUILD.bazel

@@ -39,5 +39,6 @@ java_library(
         "@maven//:com_google_guava_guava",  # unuseddeps: keep
         "@maven//:com_google_protobuf_protobuf_java",  # unuseddeps: keep
         "@maven//:com_google_protobuf_protobuf_java_util",  # unuseddeps: keep
+        "@maven_android//:com_google_protobuf_protobuf_javalite",  # unuseddeps: keep
     ],
 )

codelab/src/main/codelab/solutions/BUILD.bazel

@@ -40,5 +40,6 @@ java_library(
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_protobuf_protobuf_java_util",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )

common/internal/BUILD.bazel

@@ -72,6 +72,11 @@ java_library(
     exports = ["//common/src/main/java/dev/cel/common/internal:well_known_proto"],
 )
 
+cel_android_library(
+    name = "well_known_proto_android",
+    exports = ["//common/src/main/java/dev/cel/common/internal:well_known_proto_android"],
+)
+
 java_library(
     name = "proto_message_factory",
     exports = ["//common/src/main/java/dev/cel/common/internal:proto_message_factory"],
@@ -87,6 +92,26 @@ java_library(
     exports = ["//common/src/main/java/dev/cel/common/internal:cel_descriptor_pools"],
 )
 
+java_library(
+    name = "cel_lite_descriptor_pool",
+    exports = ["//common/src/main/java/dev/cel/common/internal:cel_lite_descriptor_pool"],
+)
+
+cel_android_library(
+    name = "cel_lite_descriptor_pool_android",
+    exports = ["//common/src/main/java/dev/cel/common/internal:cel_lite_descriptor_pool_android"],
+)
+
+java_library(
+    name = "default_lite_descriptor_pool",
+    exports = ["//common/src/main/java/dev/cel/common/internal:default_lite_descriptor_pool"],
+)
+
+cel_android_library(
+    name = "default_lite_descriptor_pool_android",
+    exports = ["//common/src/main/java/dev/cel/common/internal:default_lite_descriptor_pool_android"],
+)
+
 java_library(
     name = "safe_string_formatter",
     # used_by_android
@@ -95,6 +120,16 @@ java_library(
 
 cel_android_library(
     name = "internal_android",
-    visibility = ["//:android_allow_list"],
     exports = ["//common/src/main/java/dev/cel/common/internal:internal_android"],
 )
+
+java_library(
+    name = "proto_java_qualified_names",
+    exports = ["//common/src/main/java/dev/cel/common/internal:proto_java_qualified_names"],
+)
+
+java_library(
+    name = "reflection_util",
+    # used_by_android
+    exports = ["//common/src/main/java/dev/cel/common/internal:reflection_util"],
+)

common/src/main/java/dev/cel/common/BUILD.bazel

@@ -208,6 +208,7 @@ java_library(
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_protobuf_protobuf_java_util",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 

common/src/main/java/dev/cel/common/ast/BUILD.bazel

@@ -53,6 +53,7 @@ java_library(
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:org_jspecify_jspecify",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 
@@ -114,7 +115,7 @@ java_library(
         ":ast",
         "//common/annotations",
         "@maven//:com_google_guava_guava",
-        "@maven//:com_google_protobuf_protobuf_java",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 
@@ -138,7 +139,6 @@ cel_android_library(
         "//:auto_value",
         "//common/annotations",
         "@maven//:com_google_errorprone_error_prone_annotations",
-        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:org_jspecify_jspecify",
         "@maven_android//:com_google_guava_guava",
         "@maven_android//:com_google_protobuf_protobuf_javalite",

common/src/main/java/dev/cel/common/internal/BUILD.bazel

@@ -47,6 +47,7 @@ java_library(
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:org_antlr_antlr4_runtime",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 
@@ -61,7 +62,6 @@ cel_android_library(
         "//common/ast:ast_android",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
-        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:org_antlr_antlr4_runtime",
         "@maven_android//:com_google_guava_guava",
         "@maven_android//:com_google_protobuf_protobuf_javalite",
@@ -140,6 +140,7 @@ java_library(
         ":proto_java_qualified_names",
         "//common/annotations",
         "@maven//:com_google_protobuf_protobuf_java",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 
@@ -152,7 +153,7 @@ java_library(
         ":reflection_util",
         "//common/annotations",
         "@maven//:com_google_guava_guava",
-        "@maven//:com_google_protobuf_protobuf_java",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 
@@ -174,6 +175,7 @@ java_library(
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 
@@ -191,6 +193,7 @@ java_library(
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 
@@ -207,6 +210,7 @@ java_library(
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:org_jspecify_jspecify",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 
@@ -249,6 +253,19 @@ java_library(
     ],
 )
 
+cel_android_library(
+    name = "well_known_proto_android",
+    srcs = ["WellKnownProto.java"],
+    tags = [
+    ],
+    deps = [
+        "//common/annotations",
+        "@maven//:org_jspecify_jspecify",
+        "@maven_android//:com_google_guava_guava",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
+    ],
+)
+
 java_library(
     name = "default_message_factory",
     srcs = ["DefaultMessageFactory.java"],
@@ -291,6 +308,62 @@ java_library(
     ],
 )
 
+java_library(
+    name = "cel_lite_descriptor_pool",
+    srcs = ["CelLiteDescriptorPool.java"],
+    tags = [
+    ],
+    deps = [
+        "//protobuf:cel_lite_descriptor",
+        "@maven//:com_google_errorprone_error_prone_annotations",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
+    ],
+)
+
+cel_android_library(
+    name = "cel_lite_descriptor_pool_android",
+    srcs = ["CelLiteDescriptorPool.java"],
+    tags = [
+    ],
+    deps = [
+        "//protobuf:cel_lite_descriptor",
+        "@maven//:com_google_errorprone_error_prone_annotations",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
+    ],
+)
+
+java_library(
+    name = "default_lite_descriptor_pool",
+    srcs = ["DefaultLiteDescriptorPool.java"],
+    tags = [
+    ],
+    deps = [
+        ":cel_lite_descriptor_pool",
+        "//common/annotations",
+        "//common/internal:well_known_proto",
+        "//protobuf:cel_lite_descriptor",
+        "@maven//:com_google_errorprone_error_prone_annotations",
+        "@maven//:com_google_guava_guava",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
+    ],
+)
+
+cel_android_library(
+    name = "default_lite_descriptor_pool_android",
+    srcs = ["DefaultLiteDescriptorPool.java"],
+    tags = [
+    ],
+    deps = [
+        ":cel_lite_descriptor_pool_android",
+        "//common/annotations",
+        "//common/internal:well_known_proto_android",
+        "//protobuf:cel_lite_descriptor",
+        "@maven//:com_google_errorprone_error_prone_annotations",
+        "@maven_android//:com_google_guava_guava",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
+    ],
+)
+
 java_library(
     name = "safe_string_formatter",
     srcs = ["SafeStringFormatter.java"],
@@ -309,6 +382,7 @@ java_library(
     tags = [
     ],
     deps = [
+        "//common/annotations",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
     ],
@@ -317,6 +391,7 @@ java_library(
 java_library(
     name = "reflection_util",
     srcs = ["ReflectionUtil.java"],
+    # used_by_android
     deps = [
         "//common/annotations",
     ],

common/src/main/java/dev/cel/common/internal/CelLiteDescriptorPool.java

@@ -0,0 +1,26 @@
+// Copyright 2025 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package dev.cel.common.internal;
+
+import com.google.errorprone.annotations.Immutable;
+import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
+import java.util.Optional;
+
+/** TODO: Replace with CelLiteDescriptor */
+@Immutable
+public interface CelLiteDescriptorPool {
+  Optional<MessageLiteDescriptor> findDescriptor(String protoTypeName);
+  MessageLiteDescriptor getDescriptorOrThrow(String protoTypeName);
+}