Merge "Add note_memtag_heap_sync to the list of the allowed deps."
diff --git a/tools/Android.bp b/tools/Android.bp
index 66567ea..ad00597 100644
--- a/tools/Android.bp
+++ b/tools/Android.bp
@@ -53,9 +53,18 @@
 }
 
 prebuilt_etc {
-    name: "cur_sdkinfo",
+    name: "current_sdkinfo",
     src: ":cur_sdkinfo_src",
-    filename: "sdkinfo.binarypb",
+    filename: "sdkinfo.pb",
     installable: false,
-    visibility: ["//packages/modules/SdkExtensions"],
+    visibility: [
+        "//art:__subpackages__",
+        "//frameworks/av/apex:__subpackages__",
+        "//packages/modules/Connectivity:__subpackages__",
+        "//packages/modules/IPsec/apex:__subpackages__",
+        "//packages/modules/Permission:__subpackages__",
+        "//packages/modules/SdkExtensions:__subpackages__",
+        "//packages/modules/StatsD:__subpackages__",
+        "//packages/providers/MediaProvider:__subpackages__",
+    ],
 }