Revert "Add filegroup support to notice property." am: 64f1668eaf

am: 6796a4d25c

Change-Id: I80f4640f87f20fc7aa5593e0eb3abbdb7eba72a6

7 files changed, 408 insertions, 748 deletions

diff --git a/arm/Android.bp b/arm/Android.bp
index ce6a6dc..d126f42 100644
--- a/arm/Android.bp
+++ b/arm/Android.bp
@@ -1853,7 +1853,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libaudioroute-notice",
+    notice: "../common/NOTICE_FILES/libaudioroute.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libaudioroute.so"],
@@ -1914,7 +1914,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcap-notice",
+    notice: "../common/NOTICE_FILES/libcap.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcap.so"],
@@ -1945,7 +1945,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcrypto-notice",
+    notice: "../common/NOTICE_FILES/libcrypto.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcrypto.so"],
@@ -1976,7 +1976,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcurl-notice",
+    notice: "../common/NOTICE_FILES/libcurl.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcurl.so"],
@@ -2022,7 +2022,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libevent-notice",
+    notice: "../common/NOTICE_FILES/libevent.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libevent.so"],
@@ -2038,7 +2038,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libexif-notice",
+    notice: "../common/NOTICE_FILES/libexif.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libexif.so"],
@@ -2114,7 +2114,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libhardware_legacy-notice",
+    notice: "../common/NOTICE_FILES/libhardware_legacy.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libhardware_legacy.so"],
@@ -2160,7 +2160,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libjpeg-notice",
+    notice: "../common/NOTICE_FILES/libjpeg.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libjpeg.so"],
@@ -2176,7 +2176,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libkeymaster_messages-notice",
+    notice: "../common/NOTICE_FILES/libkeymaster_messages.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_messages.so"],
@@ -2192,7 +2192,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libkeymaster_portable-notice",
+    notice: "../common/NOTICE_FILES/libkeymaster_portable.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_portable.so"],
@@ -2208,7 +2208,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libldacBT_abr-notice",
+    notice: "../common/NOTICE_FILES/libldacBT_abr.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_abr.so"],
@@ -2224,7 +2224,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libldacBT_enc-notice",
+    notice: "../common/NOTICE_FILES/libldacBT_enc.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_enc.so"],
@@ -2240,7 +2240,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-liblz4-notice",
+    notice: "../common/NOTICE_FILES/liblz4.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/liblz4.so"],
@@ -2256,7 +2256,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libmedia_helper-notice",
+    notice: "../common/NOTICE_FILES/libmedia_helper.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so"],
@@ -2272,7 +2272,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libmedia_omx-notice",
+    notice: "../common/NOTICE_FILES/libmedia_omx.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libmedia_omx.so"],
@@ -2303,7 +2303,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libminijail-notice",
+    notice: "../common/NOTICE_FILES/libminijail.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libminijail.so"],
@@ -2334,7 +2334,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libnetutils-notice",
+    notice: "../common/NOTICE_FILES/libnetutils.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libnetutils.so"],
@@ -2350,7 +2350,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libnl-notice",
+    notice: "../common/NOTICE_FILES/libnl.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libnl.so"],
@@ -2366,7 +2366,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libopus-notice",
+    notice: "../common/NOTICE_FILES/libopus.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libopus.so"],
@@ -2382,7 +2382,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpagemap-notice",
+    notice: "../common/NOTICE_FILES/libpagemap.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpagemap.so"],
@@ -2398,7 +2398,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpcre2-notice",
+    notice: "../common/NOTICE_FILES/libpcre2.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpcre2.so"],
@@ -2414,7 +2414,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpiex-notice",
+    notice: "../common/NOTICE_FILES/libpiex.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpiex.so"],
@@ -2445,7 +2445,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpower-notice",
+    notice: "../common/NOTICE_FILES/libpower.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpower.so"],
@@ -2476,7 +2476,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libprotobuf-cpp-full-notice",
+    notice: "../common/NOTICE_FILES/libprotobuf-cpp-full.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-full.so"],
@@ -2492,7 +2492,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libprotobuf-cpp-lite-notice",
+    notice: "../common/NOTICE_FILES/libprotobuf-cpp-lite.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-lite.so"],
@@ -2508,7 +2508,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpuresoftkeymasterdevice-notice",
+    notice: "../common/NOTICE_FILES/libpuresoftkeymasterdevice.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpuresoftkeymasterdevice.so"],
@@ -2554,7 +2554,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libsoftkeymasterdevice-notice",
+    notice: "../common/NOTICE_FILES/libsoftkeymasterdevice.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libsoftkeymasterdevice.so"],
@@ -2570,7 +2570,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libspeexresampler-notice",
+    notice: "../common/NOTICE_FILES/libspeexresampler.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libspeexresampler.so"],
@@ -2586,7 +2586,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libsqlite-notice",
+    notice: "../common/NOTICE_FILES/libsqlite.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libsqlite.so"],
@@ -2602,7 +2602,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libssl-notice",
+    notice: "../common/NOTICE_FILES/libssl.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libssl.so"],
@@ -2618,7 +2618,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_amrnb_common-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_amrnb_common.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_amrnb_common.so"],
@@ -2649,7 +2649,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_enc_common-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_enc_common.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_enc_common.so"],
@@ -2665,7 +2665,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_flacdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_flacdec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_flacdec.so"],
@@ -2681,7 +2681,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_foundation-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_foundation.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_foundation.so"],
@@ -2697,7 +2697,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_omx-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_omx.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so"],
@@ -2713,7 +2713,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_omx_utils-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_omx_utils.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx_utils.so"],
@@ -2729,7 +2729,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_aacdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_aacdec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_aacdec.so"],
@@ -2745,7 +2745,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_aacenc-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_aacenc.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_aacenc.so"],
@@ -2761,7 +2761,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_amrdec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_amrdec.so"],
@@ -2777,7 +2777,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrnbenc-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_amrnbenc.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_amrnbenc.so"],
@@ -2793,7 +2793,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrwbenc-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_amrwbenc.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_amrwbenc.so"],
@@ -2839,7 +2839,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_flacdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_flacdec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_flacdec.so"],
@@ -2855,7 +2855,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_flacenc-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_flacenc.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_flacenc.so"],
@@ -2871,7 +2871,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_g711dec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_g711dec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_g711dec.so"],
@@ -2887,7 +2887,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_gsmdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_gsmdec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_gsmdec.so"],
@@ -2918,7 +2918,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mp3dec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_mp3dec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mp3dec.so"],
@@ -2949,7 +2949,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mpeg4dec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_mpeg4dec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mpeg4dec.so"],
@@ -2965,7 +2965,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mpeg4enc-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_mpeg4enc.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mpeg4enc.so"],
@@ -2996,7 +2996,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_rawdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_rawdec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_rawdec.so"],
@@ -3012,7 +3012,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vorbisdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_vorbisdec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_vorbisdec.so"],
@@ -3028,7 +3028,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vpxdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_vpxdec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_vpxdec.so"],
@@ -3044,7 +3044,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vpxenc-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_vpxenc.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_vpxenc.so"],
@@ -3105,7 +3105,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libtinyalsa-notice",
+    notice: "../common/NOTICE_FILES/libtinyalsa.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libtinyalsa.so"],
@@ -3121,7 +3121,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libtinyxml2-notice",
+    notice: "../common/NOTICE_FILES/libtinyxml2.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libtinyxml2.so"],
@@ -3137,7 +3137,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libui-notice",
+    notice: "../common/NOTICE_FILES/libui.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libui.so"],
@@ -3198,7 +3198,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libvorbisidec-notice",
+    notice: "../common/NOTICE_FILES/libvorbisidec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libvorbisidec.so"],
@@ -3229,7 +3229,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libxml2-notice",
+    notice: "../common/NOTICE_FILES/libxml2.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libxml2.so"],
@@ -3516,7 +3516,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libblas-notice",
+    notice: "../common/NOTICE_FILES/libblas.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libblas.so"],
@@ -3533,7 +3533,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libc++-notice",
+    notice: "../common/NOTICE_FILES/libc++.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libc++.so"],
@@ -3550,7 +3550,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libcompiler_rt-notice",
+    notice: "../common/NOTICE_FILES/libcompiler_rt.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libcompiler_rt.so"],
@@ -3567,7 +3567,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libcutils-notice",
+    notice: "../common/NOTICE_FILES/libcutils.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so"],
@@ -3584,7 +3584,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhardware-notice",
+    notice: "../common/NOTICE_FILES/libhardware.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhardware.so"],
@@ -3649,7 +3649,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhwbinder-notice",
+    notice: "../common/NOTICE_FILES/libhwbinder.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder.so"],
@@ -3666,7 +3666,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhwbinder_noltopgo-notice",
+    notice: "../common/NOTICE_FILES/libhwbinder_noltopgo.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder_noltopgo.so"],
@@ -3715,7 +3715,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libunwind-notice",
+    notice: "../common/NOTICE_FILES/libunwind.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libunwind.so"],
@@ -3748,7 +3748,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libutils-notice",
+    notice: "../common/NOTICE_FILES/libutils.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libutils.so"],
@@ -3765,7 +3765,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libutilscallstack-notice",
+    notice: "../common/NOTICE_FILES/libutilscallstack.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libutilscallstack.so"],
@@ -3782,7 +3782,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libz-notice",
+    notice: "../common/NOTICE_FILES/libz.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libz.so"],
diff --git a/arm/binder32/Android.bp b/arm/binder32/Android.bp
index 7c36997..641ef96 100644
--- a/arm/binder32/Android.bp
+++ b/arm/binder32/Android.bp
@@ -1961,7 +1961,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libaudioroute-notice",
+    notice: "../../common/NOTICE_FILES/libaudioroute.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libaudioroute.so"],
@@ -2026,7 +2026,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcap-notice",
+    notice: "../../common/NOTICE_FILES/libcap.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcap.so"],
@@ -2059,7 +2059,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcrypto-notice",
+    notice: "../../common/NOTICE_FILES/libcrypto.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcrypto.so"],
@@ -2092,7 +2092,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcurl-notice",
+    notice: "../../common/NOTICE_FILES/libcurl.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcurl.so"],
@@ -2141,7 +2141,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libevent-notice",
+    notice: "../../common/NOTICE_FILES/libevent.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libevent.so"],
@@ -2158,7 +2158,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libexif-notice",
+    notice: "../../common/NOTICE_FILES/libexif.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libexif.so"],
@@ -2239,7 +2239,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libhardware_legacy-notice",
+    notice: "../../common/NOTICE_FILES/libhardware_legacy.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libhardware_legacy.so"],
@@ -2288,7 +2288,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libjpeg-notice",
+    notice: "../../common/NOTICE_FILES/libjpeg.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libjpeg.so"],
@@ -2305,7 +2305,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libkeymaster_messages-notice",
+    notice: "../../common/NOTICE_FILES/libkeymaster_messages.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_messages.so"],
@@ -2322,7 +2322,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libkeymaster_portable-notice",
+    notice: "../../common/NOTICE_FILES/libkeymaster_portable.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_portable.so"],
@@ -2339,7 +2339,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libldacBT_abr-notice",
+    notice: "../../common/NOTICE_FILES/libldacBT_abr.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_abr.so"],
@@ -2356,7 +2356,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libldacBT_enc-notice",
+    notice: "../../common/NOTICE_FILES/libldacBT_enc.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_enc.so"],
@@ -2373,7 +2373,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-liblz4-notice",
+    notice: "../../common/NOTICE_FILES/liblz4.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/liblz4.so"],
@@ -2390,7 +2390,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libmedia_helper-notice",
+    notice: "../../common/NOTICE_FILES/libmedia_helper.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so"],
@@ -2407,7 +2407,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libmedia_omx-notice",
+    notice: "../../common/NOTICE_FILES/libmedia_omx.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libmedia_omx.so"],
@@ -2440,7 +2440,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libminijail-notice",
+    notice: "../../common/NOTICE_FILES/libminijail.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libminijail.so"],
@@ -2473,7 +2473,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libnetutils-notice",
+    notice: "../../common/NOTICE_FILES/libnetutils.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libnetutils.so"],
@@ -2490,7 +2490,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libnl-notice",
+    notice: "../../common/NOTICE_FILES/libnl.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libnl.so"],
@@ -2507,7 +2507,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libopus-notice",
+    notice: "../../common/NOTICE_FILES/libopus.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libopus.so"],
@@ -2524,7 +2524,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpagemap-notice",
+    notice: "../../common/NOTICE_FILES/libpagemap.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpagemap.so"],
@@ -2541,7 +2541,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpcre2-notice",
+    notice: "../../common/NOTICE_FILES/libpcre2.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpcre2.so"],
@@ -2558,7 +2558,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpiex-notice",
+    notice: "../../common/NOTICE_FILES/libpiex.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpiex.so"],
@@ -2591,7 +2591,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpower-notice",
+    notice: "../../common/NOTICE_FILES/libpower.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpower.so"],
@@ -2624,7 +2624,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libprotobuf-cpp-full-notice",
+    notice: "../../common/NOTICE_FILES/libprotobuf-cpp-full.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-full.so"],
@@ -2641,7 +2641,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libprotobuf-cpp-lite-notice",
+    notice: "../../common/NOTICE_FILES/libprotobuf-cpp-lite.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-lite.so"],
@@ -2658,7 +2658,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpuresoftkeymasterdevice-notice",
+    notice: "../../common/NOTICE_FILES/libpuresoftkeymasterdevice.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpuresoftkeymasterdevice.so"],
@@ -2707,7 +2707,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libsoftkeymasterdevice-notice",
+    notice: "../../common/NOTICE_FILES/libsoftkeymasterdevice.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libsoftkeymasterdevice.so"],
@@ -2724,7 +2724,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libspeexresampler-notice",
+    notice: "../../common/NOTICE_FILES/libspeexresampler.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libspeexresampler.so"],
@@ -2741,7 +2741,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libsqlite-notice",
+    notice: "../../common/NOTICE_FILES/libsqlite.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libsqlite.so"],
@@ -2758,7 +2758,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libssl-notice",
+    notice: "../../common/NOTICE_FILES/libssl.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libssl.so"],
@@ -2775,7 +2775,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_amrnb_common-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_amrnb_common.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_amrnb_common.so"],
@@ -2808,7 +2808,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_enc_common-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_enc_common.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_enc_common.so"],
@@ -2825,7 +2825,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_flacdec-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_flacdec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_flacdec.so"],
@@ -2842,7 +2842,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_foundation-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_foundation.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_foundation.so"],
@@ -2859,7 +2859,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_omx-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_omx.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so"],
@@ -2876,7 +2876,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_omx_utils-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_omx_utils.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx_utils.so"],
@@ -2893,7 +2893,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_aacdec-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_aacdec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_aacdec.so"],
@@ -2910,7 +2910,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_aacenc-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_aacenc.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_aacenc.so"],
@@ -2927,7 +2927,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrdec-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_amrdec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_amrdec.so"],
@@ -2944,7 +2944,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrnbenc-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_amrnbenc.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_amrnbenc.so"],
@@ -2961,7 +2961,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrwbenc-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_amrwbenc.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_amrwbenc.so"],
@@ -3010,7 +3010,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_flacdec-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_flacdec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_flacdec.so"],
@@ -3027,7 +3027,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_flacenc-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_flacenc.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_flacenc.so"],
@@ -3044,7 +3044,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_g711dec-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_g711dec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_g711dec.so"],
@@ -3061,7 +3061,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_gsmdec-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_gsmdec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_gsmdec.so"],
@@ -3094,7 +3094,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mp3dec-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_mp3dec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mp3dec.so"],
@@ -3127,7 +3127,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mpeg4dec-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_mpeg4dec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mpeg4dec.so"],
@@ -3144,7 +3144,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mpeg4enc-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_mpeg4enc.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mpeg4enc.so"],
@@ -3177,7 +3177,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_rawdec-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_rawdec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_rawdec.so"],
@@ -3194,7 +3194,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vorbisdec-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_vorbisdec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_vorbisdec.so"],
@@ -3211,7 +3211,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vpxdec-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_vpxdec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_vpxdec.so"],
@@ -3228,7 +3228,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vpxenc-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_vpxenc.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_vpxenc.so"],
@@ -3293,7 +3293,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libtinyalsa-notice",
+    notice: "../../common/NOTICE_FILES/libtinyalsa.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libtinyalsa.so"],
@@ -3310,7 +3310,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libtinyxml2-notice",
+    notice: "../../common/NOTICE_FILES/libtinyxml2.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libtinyxml2.so"],
@@ -3327,7 +3327,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libui-notice",
+    notice: "../../common/NOTICE_FILES/libui.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libui.so"],
@@ -3392,7 +3392,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libvorbisidec-notice",
+    notice: "../../common/NOTICE_FILES/libvorbisidec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libvorbisidec.so"],
@@ -3425,7 +3425,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libxml2-notice",
+    notice: "../../common/NOTICE_FILES/libxml2.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libxml2.so"],
@@ -3730,7 +3730,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libblas-notice",
+    notice: "../../common/NOTICE_FILES/libblas.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libblas.so"],
@@ -3748,7 +3748,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libc++-notice",
+    notice: "../../common/NOTICE_FILES/libc++.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libc++.so"],
@@ -3766,7 +3766,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libcompiler_rt-notice",
+    notice: "../../common/NOTICE_FILES/libcompiler_rt.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libcompiler_rt.so"],
@@ -3784,7 +3784,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libcutils-notice",
+    notice: "../../common/NOTICE_FILES/libcutils.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so"],
@@ -3802,7 +3802,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhardware-notice",
+    notice: "../../common/NOTICE_FILES/libhardware.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhardware.so"],
@@ -3871,7 +3871,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhwbinder-notice",
+    notice: "../../common/NOTICE_FILES/libhwbinder.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder.so"],
@@ -3889,7 +3889,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhwbinder_noltopgo-notice",
+    notice: "../../common/NOTICE_FILES/libhwbinder_noltopgo.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder_noltopgo.so"],
@@ -3941,7 +3941,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libunwind-notice",
+    notice: "../../common/NOTICE_FILES/libunwind.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libunwind.so"],
@@ -3976,7 +3976,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libutils-notice",
+    notice: "../../common/NOTICE_FILES/libutils.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libutils.so"],
@@ -3994,7 +3994,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libutilscallstack-notice",
+    notice: "../../common/NOTICE_FILES/libutilscallstack.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libutilscallstack.so"],
@@ -4012,7 +4012,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libz-notice",
+    notice: "../../common/NOTICE_FILES/libz.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libz.so"],
diff --git a/arm64/Android.bp b/arm64/Android.bp
index 6a2329c..48e46e2 100644
--- a/arm64/Android.bp
+++ b/arm64/Android.bp
@@ -2175,7 +2175,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libaudioroute-notice",
+    notice: "../common/NOTICE_FILES/libaudioroute.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libaudioroute.so"],
@@ -2248,7 +2248,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcap-notice",
+    notice: "../common/NOTICE_FILES/libcap.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libcap.so"],
@@ -2285,7 +2285,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcrypto-notice",
+    notice: "../common/NOTICE_FILES/libcrypto.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libcrypto.so"],
@@ -2322,7 +2322,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcurl-notice",
+    notice: "../common/NOTICE_FILES/libcurl.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libcurl.so"],
@@ -2377,7 +2377,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libevent-notice",
+    notice: "../common/NOTICE_FILES/libevent.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libevent.so"],
@@ -2396,7 +2396,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libexif-notice",
+    notice: "../common/NOTICE_FILES/libexif.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libexif.so"],
@@ -2487,7 +2487,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libhardware_legacy-notice",
+    notice: "../common/NOTICE_FILES/libhardware_legacy.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libhardware_legacy.so"],
@@ -2542,7 +2542,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libjpeg-notice",
+    notice: "../common/NOTICE_FILES/libjpeg.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libjpeg.so"],
@@ -2561,7 +2561,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libkeymaster_messages-notice",
+    notice: "../common/NOTICE_FILES/libkeymaster_messages.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libkeymaster_messages.so"],
@@ -2580,7 +2580,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libkeymaster_portable-notice",
+    notice: "../common/NOTICE_FILES/libkeymaster_portable.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libkeymaster_portable.so"],
@@ -2599,7 +2599,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libldacBT_abr-notice",
+    notice: "../common/NOTICE_FILES/libldacBT_abr.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libldacBT_abr.so"],
@@ -2618,7 +2618,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libldacBT_enc-notice",
+    notice: "../common/NOTICE_FILES/libldacBT_enc.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libldacBT_enc.so"],
@@ -2637,7 +2637,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-liblz4-notice",
+    notice: "../common/NOTICE_FILES/liblz4.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/liblz4.so"],
@@ -2656,7 +2656,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libmedia_helper-notice",
+    notice: "../common/NOTICE_FILES/libmedia_helper.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libmedia_helper.so"],
@@ -2675,7 +2675,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libmedia_omx-notice",
+    notice: "../common/NOTICE_FILES/libmedia_omx.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libmedia_omx.so"],
@@ -2712,7 +2712,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libminijail-notice",
+    notice: "../common/NOTICE_FILES/libminijail.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libminijail.so"],
@@ -2749,7 +2749,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libnetutils-notice",
+    notice: "../common/NOTICE_FILES/libnetutils.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libnetutils.so"],
@@ -2768,7 +2768,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libnl-notice",
+    notice: "../common/NOTICE_FILES/libnl.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libnl.so"],
@@ -2787,7 +2787,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libopus-notice",
+    notice: "../common/NOTICE_FILES/libopus.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libopus.so"],
@@ -2806,7 +2806,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpagemap-notice",
+    notice: "../common/NOTICE_FILES/libpagemap.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libpagemap.so"],
@@ -2825,7 +2825,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpcre2-notice",
+    notice: "../common/NOTICE_FILES/libpcre2.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libpcre2.so"],
@@ -2844,7 +2844,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpiex-notice",
+    notice: "../common/NOTICE_FILES/libpiex.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libpiex.so"],
@@ -2881,7 +2881,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpower-notice",
+    notice: "../common/NOTICE_FILES/libpower.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libpower.so"],
@@ -2918,7 +2918,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libprotobuf-cpp-full-notice",
+    notice: "../common/NOTICE_FILES/libprotobuf-cpp-full.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libprotobuf-cpp-full.so"],
@@ -2937,7 +2937,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libprotobuf-cpp-lite-notice",
+    notice: "../common/NOTICE_FILES/libprotobuf-cpp-lite.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libprotobuf-cpp-lite.so"],
@@ -2956,7 +2956,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpuresoftkeymasterdevice-notice",
+    notice: "../common/NOTICE_FILES/libpuresoftkeymasterdevice.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libpuresoftkeymasterdevice.so"],
@@ -3011,7 +3011,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libsoftkeymasterdevice-notice",
+    notice: "../common/NOTICE_FILES/libsoftkeymasterdevice.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libsoftkeymasterdevice.so"],
@@ -3030,7 +3030,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libspeexresampler-notice",
+    notice: "../common/NOTICE_FILES/libspeexresampler.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libspeexresampler.so"],
@@ -3049,7 +3049,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libsqlite-notice",
+    notice: "../common/NOTICE_FILES/libsqlite.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libsqlite.so"],
@@ -3068,7 +3068,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libssl-notice",
+    notice: "../common/NOTICE_FILES/libssl.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libssl.so"],
@@ -3087,7 +3087,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_amrnb_common-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_amrnb_common.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_amrnb_common.so"],
@@ -3124,7 +3124,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_enc_common-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_enc_common.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_enc_common.so"],
@@ -3143,7 +3143,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_flacdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_flacdec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_flacdec.so"],
@@ -3162,7 +3162,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_foundation-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_foundation.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_foundation.so"],
@@ -3181,7 +3181,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_omx-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_omx.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_omx.so"],
@@ -3200,7 +3200,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_omx_utils-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_omx_utils.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_omx_utils.so"],
@@ -3219,7 +3219,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_aacdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_aacdec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_aacdec.so"],
@@ -3235,7 +3235,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_aacenc-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_aacenc.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_aacenc.so"],
@@ -3251,7 +3251,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_amrdec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_amrdec.so"],
@@ -3267,7 +3267,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrnbenc-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_amrnbenc.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_amrnbenc.so"],
@@ -3283,7 +3283,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrwbenc-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_amrwbenc.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_amrwbenc.so"],
@@ -3329,7 +3329,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_flacdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_flacdec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_flacdec.so"],
@@ -3345,7 +3345,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_flacenc-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_flacenc.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_flacenc.so"],
@@ -3361,7 +3361,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_g711dec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_g711dec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_g711dec.so"],
@@ -3377,7 +3377,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_gsmdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_gsmdec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_gsmdec.so"],
@@ -3408,7 +3408,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mp3dec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_mp3dec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_mp3dec.so"],
@@ -3439,7 +3439,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mpeg4dec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_mpeg4dec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_mpeg4dec.so"],
@@ -3455,7 +3455,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mpeg4enc-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_mpeg4enc.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_mpeg4enc.so"],
@@ -3486,7 +3486,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_rawdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_rawdec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_rawdec.so"],
@@ -3502,7 +3502,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vorbisdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_vorbisdec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_vorbisdec.so"],
@@ -3518,7 +3518,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vpxdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_vpxdec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_vpxdec.so"],
@@ -3534,7 +3534,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vpxenc-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_vpxenc.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_vpxenc.so"],
@@ -3604,7 +3604,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libtinyalsa-notice",
+    notice: "../common/NOTICE_FILES/libtinyalsa.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libtinyalsa.so"],
@@ -3623,7 +3623,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libtinyxml2-notice",
+    notice: "../common/NOTICE_FILES/libtinyxml2.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libtinyxml2.so"],
@@ -3642,7 +3642,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libui-notice",
+    notice: "../common/NOTICE_FILES/libui.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libui.so"],
@@ -3715,7 +3715,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libvorbisidec-notice",
+    notice: "../common/NOTICE_FILES/libvorbisidec.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libvorbisidec.so"],
@@ -3752,7 +3752,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libxml2-notice",
+    notice: "../common/NOTICE_FILES/libxml2.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libxml2.so"],
@@ -4105,7 +4105,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libblas-notice",
+    notice: "../common/NOTICE_FILES/libblas.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libblas.so"],
@@ -4125,7 +4125,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libc++-notice",
+    notice: "../common/NOTICE_FILES/libc++.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libc++.so"],
@@ -4145,7 +4145,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libcompiler_rt-notice",
+    notice: "../common/NOTICE_FILES/libcompiler_rt.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libcompiler_rt.so"],
@@ -4165,7 +4165,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libcutils-notice",
+    notice: "../common/NOTICE_FILES/libcutils.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libcutils.so"],
@@ -4185,7 +4185,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhardware-notice",
+    notice: "../common/NOTICE_FILES/libhardware.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libhardware.so"],
@@ -4262,7 +4262,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhwbinder-notice",
+    notice: "../common/NOTICE_FILES/libhwbinder.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libhwbinder.so"],
@@ -4282,7 +4282,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhwbinder_noltopgo-notice",
+    notice: "../common/NOTICE_FILES/libhwbinder_noltopgo.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libhwbinder_noltopgo.so"],
@@ -4340,7 +4340,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libunwind-notice",
+    notice: "../common/NOTICE_FILES/libunwind.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libunwind.so"],
@@ -4379,7 +4379,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libutils-notice",
+    notice: "../common/NOTICE_FILES/libutils.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libutils.so"],
@@ -4399,7 +4399,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libutilscallstack-notice",
+    notice: "../common/NOTICE_FILES/libutilscallstack.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libutilscallstack.so"],
@@ -4419,7 +4419,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libz-notice",
+    notice: "../common/NOTICE_FILES/libz.so.txt",
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libz.so"],
diff --git a/common/Android.bp b/common/Android.bp
deleted file mode 100644
index 3aa6253..0000000
--- a/common/Android.bp
+++ /dev/null
@@ -1,340 +0,0 @@
-filegroup {
-    name: "vndk-v28-libaudioroute-notice",
-    srcs: ["NOTICE_FILES/libaudioroute.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libcap-notice",
-    srcs: ["NOTICE_FILES/libcap.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libcrypto-notice",
-    srcs: ["NOTICE_FILES/libcrypto.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libcurl-notice",
-    srcs: ["NOTICE_FILES/libcurl.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libevent-notice",
-    srcs: ["NOTICE_FILES/libevent.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libexif-notice",
-    srcs: ["NOTICE_FILES/libexif.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libhardware_legacy-notice",
-    srcs: ["NOTICE_FILES/libhardware_legacy.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libjpeg-notice",
-    srcs: ["NOTICE_FILES/libjpeg.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libkeymaster_messages-notice",
-    srcs: ["NOTICE_FILES/libkeymaster_messages.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libkeymaster_portable-notice",
-    srcs: ["NOTICE_FILES/libkeymaster_portable.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libldacBT_abr-notice",
-    srcs: ["NOTICE_FILES/libldacBT_abr.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libldacBT_enc-notice",
-    srcs: ["NOTICE_FILES/libldacBT_enc.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-liblz4-notice",
-    srcs: ["NOTICE_FILES/liblz4.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libmedia_helper-notice",
-    srcs: ["NOTICE_FILES/libmedia_helper.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libmedia_omx-notice",
-    srcs: ["NOTICE_FILES/libmedia_omx.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libminijail-notice",
-    srcs: ["NOTICE_FILES/libminijail.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libnetutils-notice",
-    srcs: ["NOTICE_FILES/libnetutils.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libnl-notice",
-    srcs: ["NOTICE_FILES/libnl.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libopus-notice",
-    srcs: ["NOTICE_FILES/libopus.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libpagemap-notice",
-    srcs: ["NOTICE_FILES/libpagemap.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libpcre2-notice",
-    srcs: ["NOTICE_FILES/libpcre2.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libpiex-notice",
-    srcs: ["NOTICE_FILES/libpiex.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libpower-notice",
-    srcs: ["NOTICE_FILES/libpower.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libprotobuf-cpp-full-notice",
-    srcs: ["NOTICE_FILES/libprotobuf-cpp-full.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libprotobuf-cpp-lite-notice",
-    srcs: ["NOTICE_FILES/libprotobuf-cpp-lite.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libpuresoftkeymasterdevice-notice",
-    srcs: ["NOTICE_FILES/libpuresoftkeymasterdevice.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libsoftkeymasterdevice-notice",
-    srcs: ["NOTICE_FILES/libsoftkeymasterdevice.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libspeexresampler-notice",
-    srcs: ["NOTICE_FILES/libspeexresampler.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libsqlite-notice",
-    srcs: ["NOTICE_FILES/libsqlite.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libssl-notice",
-    srcs: ["NOTICE_FILES/libssl.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_amrnb_common-notice",
-    srcs: ["NOTICE_FILES/libstagefright_amrnb_common.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_enc_common-notice",
-    srcs: ["NOTICE_FILES/libstagefright_enc_common.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_flacdec-notice",
-    srcs: ["NOTICE_FILES/libstagefright_flacdec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_foundation-notice",
-    srcs: ["NOTICE_FILES/libstagefright_foundation.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_omx-notice",
-    srcs: ["NOTICE_FILES/libstagefright_omx.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_omx_utils-notice",
-    srcs: ["NOTICE_FILES/libstagefright_omx_utils.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_aacdec-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_aacdec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_aacenc-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_aacenc.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_amrdec-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_amrdec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_amrnbenc-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_amrnbenc.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_amrwbenc-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_amrwbenc.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_flacdec-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_flacdec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_flacenc-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_flacenc.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_g711dec-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_g711dec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_gsmdec-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_gsmdec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_mp3dec-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_mp3dec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_mpeg4dec-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_mpeg4dec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_mpeg4enc-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_mpeg4enc.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_rawdec-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_rawdec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_vorbisdec-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_vorbisdec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_vpxdec-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_vpxdec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_vpxenc-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_vpxenc.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libtinyalsa-notice",
-    srcs: ["NOTICE_FILES/libtinyalsa.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libtinyxml2-notice",
-    srcs: ["NOTICE_FILES/libtinyxml2.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libui-notice",
-    srcs: ["NOTICE_FILES/libui.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libvorbisidec-notice",
-    srcs: ["NOTICE_FILES/libvorbisidec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libxml2-notice",
-    srcs: ["NOTICE_FILES/libxml2.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libblas-notice",
-    srcs: ["NOTICE_FILES/libblas.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libc++-notice",
-    srcs: ["NOTICE_FILES/libc++.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libcompiler_rt-notice",
-    srcs: ["NOTICE_FILES/libcompiler_rt.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libcutils-notice",
-    srcs: ["NOTICE_FILES/libcutils.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libhardware-notice",
-    srcs: ["NOTICE_FILES/libhardware.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libhwbinder-notice",
-    srcs: ["NOTICE_FILES/libhwbinder.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libhwbinder_noltopgo-notice",
-    srcs: ["NOTICE_FILES/libhwbinder_noltopgo.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libunwind-notice",
-    srcs: ["NOTICE_FILES/libunwind.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libutils-notice",
-    srcs: ["NOTICE_FILES/libutils.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libutilscallstack-notice",
-    srcs: ["NOTICE_FILES/libutilscallstack.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libz-notice",
-    srcs: ["NOTICE_FILES/libz.so.txt"],
-}
-
diff --git a/x86/Android.bp b/x86/Android.bp
index ba88acb..2ee8f1d 100644
--- a/x86/Android.bp
+++ b/x86/Android.bp
@@ -1853,7 +1853,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libaudioroute-notice",
+    notice: "../common/NOTICE_FILES/libaudioroute.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libaudioroute.so"],
@@ -1914,7 +1914,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcap-notice",
+    notice: "../common/NOTICE_FILES/libcap.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libcap.so"],
@@ -1945,7 +1945,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcrypto-notice",
+    notice: "../common/NOTICE_FILES/libcrypto.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libcrypto.so"],
@@ -1976,7 +1976,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcurl-notice",
+    notice: "../common/NOTICE_FILES/libcurl.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libcurl.so"],
@@ -2022,7 +2022,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libevent-notice",
+    notice: "../common/NOTICE_FILES/libevent.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libevent.so"],
@@ -2038,7 +2038,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libexif-notice",
+    notice: "../common/NOTICE_FILES/libexif.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libexif.so"],
@@ -2114,7 +2114,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libhardware_legacy-notice",
+    notice: "../common/NOTICE_FILES/libhardware_legacy.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libhardware_legacy.so"],
@@ -2160,7 +2160,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libjpeg-notice",
+    notice: "../common/NOTICE_FILES/libjpeg.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libjpeg.so"],
@@ -2176,7 +2176,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libkeymaster_messages-notice",
+    notice: "../common/NOTICE_FILES/libkeymaster_messages.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libkeymaster_messages.so"],
@@ -2192,7 +2192,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libkeymaster_portable-notice",
+    notice: "../common/NOTICE_FILES/libkeymaster_portable.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libkeymaster_portable.so"],
@@ -2208,7 +2208,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libldacBT_abr-notice",
+    notice: "../common/NOTICE_FILES/libldacBT_abr.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libldacBT_abr.so"],
@@ -2224,7 +2224,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libldacBT_enc-notice",
+    notice: "../common/NOTICE_FILES/libldacBT_enc.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libldacBT_enc.so"],
@@ -2240,7 +2240,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-liblz4-notice",
+    notice: "../common/NOTICE_FILES/liblz4.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/liblz4.so"],
@@ -2256,7 +2256,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libmedia_helper-notice",
+    notice: "../common/NOTICE_FILES/libmedia_helper.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libmedia_helper.so"],
@@ -2272,7 +2272,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libmedia_omx-notice",
+    notice: "../common/NOTICE_FILES/libmedia_omx.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libmedia_omx.so"],
@@ -2303,7 +2303,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libminijail-notice",
+    notice: "../common/NOTICE_FILES/libminijail.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libminijail.so"],
@@ -2334,7 +2334,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libnetutils-notice",
+    notice: "../common/NOTICE_FILES/libnetutils.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libnetutils.so"],
@@ -2350,7 +2350,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libnl-notice",
+    notice: "../common/NOTICE_FILES/libnl.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libnl.so"],
@@ -2366,7 +2366,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libopus-notice",
+    notice: "../common/NOTICE_FILES/libopus.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libopus.so"],
@@ -2382,7 +2382,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpagemap-notice",
+    notice: "../common/NOTICE_FILES/libpagemap.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpagemap.so"],
@@ -2398,7 +2398,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpcre2-notice",
+    notice: "../common/NOTICE_FILES/libpcre2.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpcre2.so"],
@@ -2414,7 +2414,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpiex-notice",
+    notice: "../common/NOTICE_FILES/libpiex.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpiex.so"],
@@ -2445,7 +2445,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpower-notice",
+    notice: "../common/NOTICE_FILES/libpower.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpower.so"],
@@ -2476,7 +2476,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libprotobuf-cpp-full-notice",
+    notice: "../common/NOTICE_FILES/libprotobuf-cpp-full.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libprotobuf-cpp-full.so"],
@@ -2492,7 +2492,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libprotobuf-cpp-lite-notice",
+    notice: "../common/NOTICE_FILES/libprotobuf-cpp-lite.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libprotobuf-cpp-lite.so"],
@@ -2508,7 +2508,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpuresoftkeymasterdevice-notice",
+    notice: "../common/NOTICE_FILES/libpuresoftkeymasterdevice.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpuresoftkeymasterdevice.so"],
@@ -2554,7 +2554,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libsoftkeymasterdevice-notice",
+    notice: "../common/NOTICE_FILES/libsoftkeymasterdevice.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libsoftkeymasterdevice.so"],
@@ -2570,7 +2570,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libspeexresampler-notice",
+    notice: "../common/NOTICE_FILES/libspeexresampler.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libspeexresampler.so"],
@@ -2586,7 +2586,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libsqlite-notice",
+    notice: "../common/NOTICE_FILES/libsqlite.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libsqlite.so"],
@@ -2602,7 +2602,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libssl-notice",
+    notice: "../common/NOTICE_FILES/libssl.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libssl.so"],
@@ -2618,7 +2618,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_amrnb_common-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_amrnb_common.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_amrnb_common.so"],
@@ -2649,7 +2649,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_enc_common-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_enc_common.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_enc_common.so"],
@@ -2665,7 +2665,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_flacdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_flacdec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_flacdec.so"],
@@ -2681,7 +2681,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_foundation-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_foundation.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_foundation.so"],
@@ -2697,7 +2697,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_omx-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_omx.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_omx.so"],
@@ -2713,7 +2713,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_omx_utils-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_omx_utils.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_omx_utils.so"],
@@ -2729,7 +2729,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_aacdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_aacdec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_aacdec.so"],
@@ -2745,7 +2745,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_aacenc-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_aacenc.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_aacenc.so"],
@@ -2761,7 +2761,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_amrdec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_amrdec.so"],
@@ -2777,7 +2777,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrnbenc-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_amrnbenc.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_amrnbenc.so"],
@@ -2793,7 +2793,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrwbenc-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_amrwbenc.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_amrwbenc.so"],
@@ -2839,7 +2839,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_flacdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_flacdec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_flacdec.so"],
@@ -2855,7 +2855,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_flacenc-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_flacenc.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_flacenc.so"],
@@ -2871,7 +2871,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_g711dec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_g711dec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_g711dec.so"],
@@ -2887,7 +2887,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_gsmdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_gsmdec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_gsmdec.so"],
@@ -2918,7 +2918,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mp3dec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_mp3dec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_mp3dec.so"],
@@ -2949,7 +2949,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mpeg4dec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_mpeg4dec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_mpeg4dec.so"],
@@ -2965,7 +2965,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mpeg4enc-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_mpeg4enc.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_mpeg4enc.so"],
@@ -2996,7 +2996,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_rawdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_rawdec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_rawdec.so"],
@@ -3012,7 +3012,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vorbisdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_vorbisdec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_vorbisdec.so"],
@@ -3028,7 +3028,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vpxdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_vpxdec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_vpxdec.so"],
@@ -3044,7 +3044,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vpxenc-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_vpxenc.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_vpxenc.so"],
@@ -3105,7 +3105,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libtinyalsa-notice",
+    notice: "../common/NOTICE_FILES/libtinyalsa.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libtinyalsa.so"],
@@ -3121,7 +3121,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libtinyxml2-notice",
+    notice: "../common/NOTICE_FILES/libtinyxml2.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libtinyxml2.so"],
@@ -3137,7 +3137,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libui-notice",
+    notice: "../common/NOTICE_FILES/libui.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libui.so"],
@@ -3198,7 +3198,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libvorbisidec-notice",
+    notice: "../common/NOTICE_FILES/libvorbisidec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libvorbisidec.so"],
@@ -3229,7 +3229,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libxml2-notice",
+    notice: "../common/NOTICE_FILES/libxml2.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libxml2.so"],
@@ -3516,7 +3516,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libblas-notice",
+    notice: "../common/NOTICE_FILES/libblas.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libblas.so"],
@@ -3533,7 +3533,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libc++-notice",
+    notice: "../common/NOTICE_FILES/libc++.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libc++.so"],
@@ -3550,7 +3550,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libcompiler_rt-notice",
+    notice: "../common/NOTICE_FILES/libcompiler_rt.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libcompiler_rt.so"],
@@ -3567,7 +3567,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libcutils-notice",
+    notice: "../common/NOTICE_FILES/libcutils.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libcutils.so"],
@@ -3584,7 +3584,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhardware-notice",
+    notice: "../common/NOTICE_FILES/libhardware.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhardware.so"],
@@ -3649,7 +3649,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhwbinder-notice",
+    notice: "../common/NOTICE_FILES/libhwbinder.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhwbinder.so"],
@@ -3666,7 +3666,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhwbinder_noltopgo-notice",
+    notice: "../common/NOTICE_FILES/libhwbinder_noltopgo.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhwbinder_noltopgo.so"],
@@ -3715,7 +3715,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libunwind-notice",
+    notice: "../common/NOTICE_FILES/libunwind.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libunwind.so"],
@@ -3748,7 +3748,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libutils-notice",
+    notice: "../common/NOTICE_FILES/libutils.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libutils.so"],
@@ -3765,7 +3765,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libutilscallstack-notice",
+    notice: "../common/NOTICE_FILES/libutilscallstack.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libutilscallstack.so"],
@@ -3782,7 +3782,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libz-notice",
+    notice: "../common/NOTICE_FILES/libz.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libz.so"],
diff --git a/x86/binder32/Android.bp b/x86/binder32/Android.bp
index 80a2b72..c00b233 100644
--- a/x86/binder32/Android.bp
+++ b/x86/binder32/Android.bp
@@ -1961,7 +1961,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libaudioroute-notice",
+    notice: "../../common/NOTICE_FILES/libaudioroute.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libaudioroute.so"],
@@ -2026,7 +2026,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcap-notice",
+    notice: "../../common/NOTICE_FILES/libcap.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libcap.so"],
@@ -2059,7 +2059,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcrypto-notice",
+    notice: "../../common/NOTICE_FILES/libcrypto.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libcrypto.so"],
@@ -2092,7 +2092,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcurl-notice",
+    notice: "../../common/NOTICE_FILES/libcurl.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libcurl.so"],
@@ -2141,7 +2141,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libevent-notice",
+    notice: "../../common/NOTICE_FILES/libevent.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libevent.so"],
@@ -2158,7 +2158,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libexif-notice",
+    notice: "../../common/NOTICE_FILES/libexif.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libexif.so"],
@@ -2239,7 +2239,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libhardware_legacy-notice",
+    notice: "../../common/NOTICE_FILES/libhardware_legacy.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libhardware_legacy.so"],
@@ -2288,7 +2288,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libjpeg-notice",
+    notice: "../../common/NOTICE_FILES/libjpeg.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libjpeg.so"],
@@ -2305,7 +2305,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libkeymaster_messages-notice",
+    notice: "../../common/NOTICE_FILES/libkeymaster_messages.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libkeymaster_messages.so"],
@@ -2322,7 +2322,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libkeymaster_portable-notice",
+    notice: "../../common/NOTICE_FILES/libkeymaster_portable.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libkeymaster_portable.so"],
@@ -2339,7 +2339,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libldacBT_abr-notice",
+    notice: "../../common/NOTICE_FILES/libldacBT_abr.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libldacBT_abr.so"],
@@ -2356,7 +2356,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libldacBT_enc-notice",
+    notice: "../../common/NOTICE_FILES/libldacBT_enc.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libldacBT_enc.so"],
@@ -2373,7 +2373,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-liblz4-notice",
+    notice: "../../common/NOTICE_FILES/liblz4.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/liblz4.so"],
@@ -2390,7 +2390,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libmedia_helper-notice",
+    notice: "../../common/NOTICE_FILES/libmedia_helper.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libmedia_helper.so"],
@@ -2407,7 +2407,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libmedia_omx-notice",
+    notice: "../../common/NOTICE_FILES/libmedia_omx.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libmedia_omx.so"],
@@ -2440,7 +2440,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libminijail-notice",
+    notice: "../../common/NOTICE_FILES/libminijail.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libminijail.so"],
@@ -2473,7 +2473,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libnetutils-notice",
+    notice: "../../common/NOTICE_FILES/libnetutils.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libnetutils.so"],
@@ -2490,7 +2490,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libnl-notice",
+    notice: "../../common/NOTICE_FILES/libnl.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libnl.so"],
@@ -2507,7 +2507,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libopus-notice",
+    notice: "../../common/NOTICE_FILES/libopus.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libopus.so"],
@@ -2524,7 +2524,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpagemap-notice",
+    notice: "../../common/NOTICE_FILES/libpagemap.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpagemap.so"],
@@ -2541,7 +2541,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpcre2-notice",
+    notice: "../../common/NOTICE_FILES/libpcre2.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpcre2.so"],
@@ -2558,7 +2558,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpiex-notice",
+    notice: "../../common/NOTICE_FILES/libpiex.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpiex.so"],
@@ -2591,7 +2591,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpower-notice",
+    notice: "../../common/NOTICE_FILES/libpower.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpower.so"],
@@ -2624,7 +2624,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libprotobuf-cpp-full-notice",
+    notice: "../../common/NOTICE_FILES/libprotobuf-cpp-full.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libprotobuf-cpp-full.so"],
@@ -2641,7 +2641,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libprotobuf-cpp-lite-notice",
+    notice: "../../common/NOTICE_FILES/libprotobuf-cpp-lite.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libprotobuf-cpp-lite.so"],
@@ -2658,7 +2658,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpuresoftkeymasterdevice-notice",
+    notice: "../../common/NOTICE_FILES/libpuresoftkeymasterdevice.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpuresoftkeymasterdevice.so"],
@@ -2707,7 +2707,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libsoftkeymasterdevice-notice",
+    notice: "../../common/NOTICE_FILES/libsoftkeymasterdevice.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libsoftkeymasterdevice.so"],
@@ -2724,7 +2724,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libspeexresampler-notice",
+    notice: "../../common/NOTICE_FILES/libspeexresampler.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libspeexresampler.so"],
@@ -2741,7 +2741,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libsqlite-notice",
+    notice: "../../common/NOTICE_FILES/libsqlite.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libsqlite.so"],
@@ -2758,7 +2758,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libssl-notice",
+    notice: "../../common/NOTICE_FILES/libssl.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libssl.so"],
@@ -2775,7 +2775,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_amrnb_common-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_amrnb_common.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_amrnb_common.so"],
@@ -2808,7 +2808,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_enc_common-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_enc_common.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_enc_common.so"],
@@ -2825,7 +2825,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_flacdec-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_flacdec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_flacdec.so"],
@@ -2842,7 +2842,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_foundation-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_foundation.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_foundation.so"],
@@ -2859,7 +2859,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_omx-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_omx.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_omx.so"],
@@ -2876,7 +2876,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_omx_utils-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_omx_utils.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_omx_utils.so"],
@@ -2893,7 +2893,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_aacdec-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_aacdec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_aacdec.so"],
@@ -2910,7 +2910,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_aacenc-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_aacenc.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_aacenc.so"],
@@ -2927,7 +2927,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrdec-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_amrdec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_amrdec.so"],
@@ -2944,7 +2944,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrnbenc-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_amrnbenc.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_amrnbenc.so"],
@@ -2961,7 +2961,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrwbenc-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_amrwbenc.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_amrwbenc.so"],
@@ -3010,7 +3010,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_flacdec-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_flacdec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_flacdec.so"],
@@ -3027,7 +3027,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_flacenc-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_flacenc.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_flacenc.so"],
@@ -3044,7 +3044,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_g711dec-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_g711dec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_g711dec.so"],
@@ -3061,7 +3061,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_gsmdec-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_gsmdec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_gsmdec.so"],
@@ -3094,7 +3094,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mp3dec-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_mp3dec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_mp3dec.so"],
@@ -3127,7 +3127,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mpeg4dec-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_mpeg4dec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_mpeg4dec.so"],
@@ -3144,7 +3144,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mpeg4enc-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_mpeg4enc.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_mpeg4enc.so"],
@@ -3177,7 +3177,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_rawdec-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_rawdec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_rawdec.so"],
@@ -3194,7 +3194,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vorbisdec-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_vorbisdec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_vorbisdec.so"],
@@ -3211,7 +3211,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vpxdec-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_vpxdec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_vpxdec.so"],
@@ -3228,7 +3228,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vpxenc-notice",
+    notice: "../../common/NOTICE_FILES/libstagefright_soft_vpxenc.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_vpxenc.so"],
@@ -3293,7 +3293,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libtinyalsa-notice",
+    notice: "../../common/NOTICE_FILES/libtinyalsa.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libtinyalsa.so"],
@@ -3310,7 +3310,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libtinyxml2-notice",
+    notice: "../../common/NOTICE_FILES/libtinyxml2.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libtinyxml2.so"],
@@ -3327,7 +3327,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libui-notice",
+    notice: "../../common/NOTICE_FILES/libui.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libui.so"],
@@ -3392,7 +3392,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libvorbisidec-notice",
+    notice: "../../common/NOTICE_FILES/libvorbisidec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libvorbisidec.so"],
@@ -3425,7 +3425,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libxml2-notice",
+    notice: "../../common/NOTICE_FILES/libxml2.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libxml2.so"],
@@ -3730,7 +3730,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libblas-notice",
+    notice: "../../common/NOTICE_FILES/libblas.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libblas.so"],
@@ -3748,7 +3748,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libc++-notice",
+    notice: "../../common/NOTICE_FILES/libc++.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libc++.so"],
@@ -3766,7 +3766,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libcompiler_rt-notice",
+    notice: "../../common/NOTICE_FILES/libcompiler_rt.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libcompiler_rt.so"],
@@ -3784,7 +3784,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libcutils-notice",
+    notice: "../../common/NOTICE_FILES/libcutils.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libcutils.so"],
@@ -3802,7 +3802,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhardware-notice",
+    notice: "../../common/NOTICE_FILES/libhardware.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhardware.so"],
@@ -3871,7 +3871,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhwbinder-notice",
+    notice: "../../common/NOTICE_FILES/libhwbinder.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhwbinder.so"],
@@ -3889,7 +3889,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhwbinder_noltopgo-notice",
+    notice: "../../common/NOTICE_FILES/libhwbinder_noltopgo.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhwbinder_noltopgo.so"],
@@ -3941,7 +3941,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libunwind-notice",
+    notice: "../../common/NOTICE_FILES/libunwind.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libunwind.so"],
@@ -3976,7 +3976,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libutils-notice",
+    notice: "../../common/NOTICE_FILES/libutils.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libutils.so"],
@@ -3994,7 +3994,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libutilscallstack-notice",
+    notice: "../../common/NOTICE_FILES/libutilscallstack.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libutilscallstack.so"],
@@ -4012,7 +4012,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libz-notice",
+    notice: "../../common/NOTICE_FILES/libz.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libz.so"],
diff --git a/x86_64/Android.bp b/x86_64/Android.bp
index 956d67e..913b27e 100644
--- a/x86_64/Android.bp
+++ b/x86_64/Android.bp
@@ -2175,7 +2175,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libaudioroute-notice",
+    notice: "../common/NOTICE_FILES/libaudioroute.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libaudioroute.so"],
@@ -2248,7 +2248,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcap-notice",
+    notice: "../common/NOTICE_FILES/libcap.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libcap.so"],
@@ -2285,7 +2285,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcrypto-notice",
+    notice: "../common/NOTICE_FILES/libcrypto.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libcrypto.so"],
@@ -2322,7 +2322,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcurl-notice",
+    notice: "../common/NOTICE_FILES/libcurl.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libcurl.so"],
@@ -2377,7 +2377,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libevent-notice",
+    notice: "../common/NOTICE_FILES/libevent.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libevent.so"],
@@ -2396,7 +2396,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libexif-notice",
+    notice: "../common/NOTICE_FILES/libexif.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libexif.so"],
@@ -2487,7 +2487,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libhardware_legacy-notice",
+    notice: "../common/NOTICE_FILES/libhardware_legacy.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libhardware_legacy.so"],
@@ -2542,7 +2542,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libjpeg-notice",
+    notice: "../common/NOTICE_FILES/libjpeg.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libjpeg.so"],
@@ -2561,7 +2561,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libkeymaster_messages-notice",
+    notice: "../common/NOTICE_FILES/libkeymaster_messages.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libkeymaster_messages.so"],
@@ -2580,7 +2580,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libkeymaster_portable-notice",
+    notice: "../common/NOTICE_FILES/libkeymaster_portable.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libkeymaster_portable.so"],
@@ -2599,7 +2599,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libldacBT_abr-notice",
+    notice: "../common/NOTICE_FILES/libldacBT_abr.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libldacBT_abr.so"],
@@ -2618,7 +2618,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libldacBT_enc-notice",
+    notice: "../common/NOTICE_FILES/libldacBT_enc.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libldacBT_enc.so"],
@@ -2637,7 +2637,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-liblz4-notice",
+    notice: "../common/NOTICE_FILES/liblz4.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/liblz4.so"],
@@ -2656,7 +2656,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libmedia_helper-notice",
+    notice: "../common/NOTICE_FILES/libmedia_helper.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libmedia_helper.so"],
@@ -2675,7 +2675,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libmedia_omx-notice",
+    notice: "../common/NOTICE_FILES/libmedia_omx.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libmedia_omx.so"],
@@ -2712,7 +2712,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libminijail-notice",
+    notice: "../common/NOTICE_FILES/libminijail.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libminijail.so"],
@@ -2749,7 +2749,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libnetutils-notice",
+    notice: "../common/NOTICE_FILES/libnetutils.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libnetutils.so"],
@@ -2768,7 +2768,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libnl-notice",
+    notice: "../common/NOTICE_FILES/libnl.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libnl.so"],
@@ -2787,7 +2787,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libopus-notice",
+    notice: "../common/NOTICE_FILES/libopus.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libopus.so"],
@@ -2806,7 +2806,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpagemap-notice",
+    notice: "../common/NOTICE_FILES/libpagemap.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libpagemap.so"],
@@ -2825,7 +2825,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpcre2-notice",
+    notice: "../common/NOTICE_FILES/libpcre2.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libpcre2.so"],
@@ -2844,7 +2844,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpiex-notice",
+    notice: "../common/NOTICE_FILES/libpiex.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libpiex.so"],
@@ -2881,7 +2881,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpower-notice",
+    notice: "../common/NOTICE_FILES/libpower.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libpower.so"],
@@ -2918,7 +2918,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libprotobuf-cpp-full-notice",
+    notice: "../common/NOTICE_FILES/libprotobuf-cpp-full.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libprotobuf-cpp-full.so"],
@@ -2937,7 +2937,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libprotobuf-cpp-lite-notice",
+    notice: "../common/NOTICE_FILES/libprotobuf-cpp-lite.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libprotobuf-cpp-lite.so"],
@@ -2956,7 +2956,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpuresoftkeymasterdevice-notice",
+    notice: "../common/NOTICE_FILES/libpuresoftkeymasterdevice.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libpuresoftkeymasterdevice.so"],
@@ -3011,7 +3011,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libsoftkeymasterdevice-notice",
+    notice: "../common/NOTICE_FILES/libsoftkeymasterdevice.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libsoftkeymasterdevice.so"],
@@ -3030,7 +3030,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libspeexresampler-notice",
+    notice: "../common/NOTICE_FILES/libspeexresampler.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libspeexresampler.so"],
@@ -3049,7 +3049,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libsqlite-notice",
+    notice: "../common/NOTICE_FILES/libsqlite.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libsqlite.so"],
@@ -3068,7 +3068,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libssl-notice",
+    notice: "../common/NOTICE_FILES/libssl.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libssl.so"],
@@ -3087,7 +3087,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_amrnb_common-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_amrnb_common.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_amrnb_common.so"],
@@ -3124,7 +3124,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_enc_common-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_enc_common.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_enc_common.so"],
@@ -3143,7 +3143,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_flacdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_flacdec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_flacdec.so"],
@@ -3162,7 +3162,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_foundation-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_foundation.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_foundation.so"],
@@ -3181,7 +3181,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_omx-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_omx.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_omx.so"],
@@ -3200,7 +3200,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_omx_utils-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_omx_utils.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_omx_utils.so"],
@@ -3219,7 +3219,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_aacdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_aacdec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_aacdec.so"],
@@ -3235,7 +3235,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_aacenc-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_aacenc.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_aacenc.so"],
@@ -3251,7 +3251,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_amrdec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_amrdec.so"],
@@ -3267,7 +3267,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrnbenc-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_amrnbenc.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_amrnbenc.so"],
@@ -3283,7 +3283,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrwbenc-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_amrwbenc.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_amrwbenc.so"],
@@ -3329,7 +3329,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_flacdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_flacdec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_flacdec.so"],
@@ -3345,7 +3345,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_flacenc-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_flacenc.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_flacenc.so"],
@@ -3361,7 +3361,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_g711dec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_g711dec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_g711dec.so"],
@@ -3377,7 +3377,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_gsmdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_gsmdec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_gsmdec.so"],
@@ -3408,7 +3408,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mp3dec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_mp3dec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_mp3dec.so"],
@@ -3439,7 +3439,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mpeg4dec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_mpeg4dec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_mpeg4dec.so"],
@@ -3455,7 +3455,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mpeg4enc-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_mpeg4enc.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_mpeg4enc.so"],
@@ -3486,7 +3486,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_rawdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_rawdec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_rawdec.so"],
@@ -3502,7 +3502,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vorbisdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_vorbisdec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_vorbisdec.so"],
@@ -3518,7 +3518,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vpxdec-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_vpxdec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_vpxdec.so"],
@@ -3534,7 +3534,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vpxenc-notice",
+    notice: "../common/NOTICE_FILES/libstagefright_soft_vpxenc.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_vpxenc.so"],
@@ -3604,7 +3604,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libtinyalsa-notice",
+    notice: "../common/NOTICE_FILES/libtinyalsa.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libtinyalsa.so"],
@@ -3623,7 +3623,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libtinyxml2-notice",
+    notice: "../common/NOTICE_FILES/libtinyxml2.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libtinyxml2.so"],
@@ -3642,7 +3642,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libui-notice",
+    notice: "../common/NOTICE_FILES/libui.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libui.so"],
@@ -3715,7 +3715,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libvorbisidec-notice",
+    notice: "../common/NOTICE_FILES/libvorbisidec.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libvorbisidec.so"],
@@ -3752,7 +3752,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libxml2-notice",
+    notice: "../common/NOTICE_FILES/libxml2.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libxml2.so"],
@@ -4105,7 +4105,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libblas-notice",
+    notice: "../common/NOTICE_FILES/libblas.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libblas.so"],
@@ -4125,7 +4125,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libc++-notice",
+    notice: "../common/NOTICE_FILES/libc++.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libc++.so"],
@@ -4145,7 +4145,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libcompiler_rt-notice",
+    notice: "../common/NOTICE_FILES/libcompiler_rt.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libcompiler_rt.so"],
@@ -4165,7 +4165,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libcutils-notice",
+    notice: "../common/NOTICE_FILES/libcutils.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libcutils.so"],
@@ -4185,7 +4185,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhardware-notice",
+    notice: "../common/NOTICE_FILES/libhardware.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libhardware.so"],
@@ -4262,7 +4262,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhwbinder-notice",
+    notice: "../common/NOTICE_FILES/libhwbinder.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libhwbinder.so"],
@@ -4282,7 +4282,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhwbinder_noltopgo-notice",
+    notice: "../common/NOTICE_FILES/libhwbinder_noltopgo.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libhwbinder_noltopgo.so"],
@@ -4340,7 +4340,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libunwind-notice",
+    notice: "../common/NOTICE_FILES/libunwind.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libunwind.so"],
@@ -4379,7 +4379,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libutils-notice",
+    notice: "../common/NOTICE_FILES/libutils.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libutils.so"],
@@ -4399,7 +4399,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libutilscallstack-notice",
+    notice: "../common/NOTICE_FILES/libutilscallstack.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libutilscallstack.so"],
@@ -4419,7 +4419,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libz-notice",
+    notice: "../common/NOTICE_FILES/libz.so.txt",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libz.so"],