Internal Changes

checker/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"],
@@ -53,3 +54,8 @@ java_library(
     name = "standard_decl",
     exports = ["//checker/src/main/java/dev/cel/checker:standard_decl"],
 )
+
+cel_android_library(
+    name = "standard_decl_android",
+    exports = ["//checker/src/main/java/dev/cel/checker:standard_decl_android"],
+)

checker/src/main/java/dev/cel/checker/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 = [
@@ -69,7 +70,6 @@ java_library(
         ":checker_legacy_environment",
         ":proto_type_mask",
         ":standard_decl",
-        ":type_provider_legacy_impl",
         "//common:cel_ast",
         "//common:cel_descriptor_util",
         "//common:cel_function_decl",
@@ -235,3 +235,23 @@ java_library(
         "@maven//:com_google_guava_guava",
     ],
 )
+
+cel_android_library(
+    name = "standard_decl_android",
+    srcs = [
+        "CelStandardDeclarations.java",
+    ],
+    tags = [
+    ],
+    deps = [
+        "//common:cel_function_decl_android",
+        "//common:cel_overload_decl_android",
+        "//common:cel_var_decl_android",
+        "//common:operator_android",
+        "//common/types:cel_types_android",
+        "//common/types:type_providers_android",
+        "//common/types:types_android",
+        "@maven//:com_google_errorprone_error_prone_annotations",
+        "@maven_android//:com_google_guava_guava",
+    ],
+)

checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java

@@ -111,6 +111,8 @@ public CelTypeProvider getTypeProvider() {
   }
 
   @Override
+  // TypeProvider is deprecated, but preserved for backwards compatibility.
+  @SuppressWarnings("deprecation")
   public CelCheckerBuilder toCheckerBuilder() {
     CelCheckerBuilder builder =
         new Builder()
@@ -124,6 +126,10 @@ public CelCheckerBuilder toCheckerBuilder() {
             .addFileTypes(fileDescriptors)
             .addProtoTypeMasks(protoTypeMasks);
 
+    if (typeProvider != null) {
+      builder.setTypeProvider(typeProvider);
+    }
+
     if (expectedResultType.isPresent()) {
       builder.setResultType(expectedResultType.get());
     }
@@ -162,11 +168,13 @@ public void accept(EnvVisitor envVisitor) {
   private Env getEnv(Errors errors) {
     Env env;
     if (overriddenStandardDeclarations != null) {
-      env = Env.standard(overriddenStandardDeclarations, errors, typeProvider, celOptions);
+      env =
+          Env.standard(
+              overriddenStandardDeclarations, errors, celTypeProvider, typeProvider, celOptions);
     } else if (standardEnvironmentEnabled) {
-      env = Env.standard(errors, typeProvider, celOptions);
+      env = Env.standard(errors, celTypeProvider, typeProvider, celOptions);
     } else {
-      env = Env.unconfigured(errors, typeProvider, celOptions);
+      env = Env.unconfigured(errors, celTypeProvider, typeProvider, celOptions);
     }
     identDeclarations.forEach(env::add);
     functionDeclarations.forEach(env::add);
@@ -459,20 +467,13 @@ public CelCheckerLegacyImpl build() {
         messageTypeProvider = protoTypeMaskTypeProvider;
       }
 
-      TypeProvider legacyProvider = new TypeProviderLegacyImpl(messageTypeProvider);
-      if (customTypeProvider != null) {
-        legacyProvider =
-            new TypeProvider.CombinedTypeProvider(
-                ImmutableList.of(customTypeProvider, legacyProvider));
-      }
-
       return new CelCheckerLegacyImpl(
           celOptions,
           container,
           identDeclarationSet,
           functionDeclarations.build(),
           Optional.fromNullable(expectedResultType),
-          legacyProvider,
+          customTypeProvider,
           messageTypeProvider,
           standardEnvironmentEnabled,
           standardDeclarations,