Merge "Use system partition visibility" into main
diff --git a/Android.bp b/Android.bp
index 98552a7..523f55c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -177,11 +177,10 @@
     ],
     // Currently, only microdroid, Ravenwood, and cf system image can refer to system-build.prop
     visibility: [
-        "//build/make/target/product/generic",
-        "//build/make/target/product/gsi",
         "//build/soong/fsgen",
         "//packages/modules/Virtualization/build/microdroid",
         "//frameworks/base/ravenwood",
+        "//visibility:any_system_partition",
     ],
 }
 
diff --git a/compliance/Android.bp b/compliance/Android.bp
index 6662970..a1f2015 100644
--- a/compliance/Android.bp
+++ b/compliance/Android.bp
@@ -34,7 +34,6 @@
     name: "notice_xml_system",
     partition_name: "system",
     visibility: [
-        "//build/make/target/product/generic",
-        "//build/make/target/product/gsi",
+        "//visibility:any_system_partition",
     ],
 }