Use system partition visibility

Use system partition visibility for modules which should be installed within the system image - build props and notice file.

Bug: 370352548
Change-Id: Ib97afa421ca0807e555be1239d781162ac4e7a0f
Test: aosp_cf_x86_64_phone build succeeds

2 files changed, 2 insertions, 4 deletions

diff --git a/Android.bp b/Android.bp
index 98552a779..523f55c4b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -177,11 +177,10 @@ build_prop {
     ],
     // 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 6662970d8..a1f2015b0 100644
--- a/compliance/Android.bp
+++ b/compliance/Android.bp
@@ -34,7 +34,6 @@ notice_xml {
     name: "notice_xml_system",
     partition_name: "system",
     visibility: [
-        "//build/make/target/product/generic",
-        "//build/make/target/product/gsi",
+        "//visibility:any_system_partition",
     ],
 }