diff --git a/java/Android.bp b/java/Android.bp
index df0d1eb3d..e25accf2a 100644
--- a/java/Android.bp
+++ b/java/Android.bp
@@ -87,6 +87,7 @@ bootstrap_go_package {
         "dexpreopt_bootjars_test.go",
         "droiddoc_test.go",
         "droidstubs_test.go",
+        "genrule_test.go",
         "hiddenapi_singleton_test.go",
         "jacoco_test.go",
         "java_test.go",
@@ -97,6 +98,7 @@ bootstrap_go_package {
         "platform_compat_config_test.go",
         "plugin_test.go",
         "prebuilt_apis_test.go",
+        "proto_test.go",
         "rro_test.go",
         "sdk_test.go",
         "sdk_library_test.go",