1 files changed, 32 insertions, 8 deletions
diff --git a/sdksandbox/tests/manual-test-apps/SdkSandboxCodeProvider/Android.bp b/sdksandbox/tests/manual-test-apps/SdkSandboxCodeProvider/Android.bp
index a1b6d6470b..dfa63cc708 100644
--- a/sdksandbox/tests/manual-test-apps/SdkSandboxCodeProvider/Android.bp
+++ b/sdksandbox/tests/manual-test-apps/SdkSandboxCodeProvider/Android.bp
@@ -16,26 +16,50 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
+java_defaults {
+    name: "SdkSandboxCodeDefaults",
+    min_sdk_version: "33",
+    target_sdk_version: "33",
+    static_libs: ["SdkInterfaces"],
+    resource_dirs: ["res"],
+    certificate: ":sdksandbox-test",
+}
+
 android_test_helper_app {
     name: "SdkSandboxCodeProvider",
-    defaults: ["platform_app_defaults"],
-    certificate: ":sdksandbox-test",
+    defaults: [
+        "platform_app_defaults",
+        "SdkSandboxCodeDefaults"
+    ],
     srcs: [
        "src/**/sdksandboxcode_1/*.java",
+       "src/**/apiimplementation/*.java",
     ],
-    resource_dirs: ["res"],
-    platform_apis: true,
     manifest: "AndroidManifest.xml",
 }
 
 android_test_helper_app {
     name: "SdkSandboxWebViewProvider",
-    defaults: ["platform_app_defaults"],
-    certificate: ":sdksandbox-test",
+    defaults: [
+        "platform_app_defaults",
+        "SdkSandboxCodeDefaults"
+    ],
     srcs: [
        "src/**/sdksandboxcode_webview/*.java",
+       "src/**/apiimplementation/*.java"
     ],
-    resource_dirs: ["res"],
-    platform_apis: true,
     manifest: "AndroidManifest_WebViewProvider.xml",
 }
+
+android_test_helper_app {
+    name: "SdkSandboxMediateeProvider",
+    defaults: [
+        "platform_app_defaults",
+        "SdkSandboxCodeDefaults"
+    ],
+    srcs: [
+       "src/**/sdksandboxcode_mediatee/*.java",
+       "src/**/apiimplementation/*.java"
+    ],
+    manifest: "AndroidManifest_MediateeProvider.xml",
+}