Merge branch 'lineage-23.1' of https://github.com/LineageOS/android_build into HEADw16.1

* 'lineage-23.1' of https://github.com/LineageOS/android_build: (415 commits)
  Exclude perf-setup-sh from userdebug builds
  Reapply "Drop legacy vboot support."
  Revert "build: Enable super image build rules depending on single super block device"
  Version bump to BP3A.250905.014 [core/build_id.mk]
  Version bump to BP3A.250905.013 [core/build_id.mk]
  Version bump to BP3A.250905.012 [core/build_id.mk]
  Version bump to BP3A.250905.011 [core/build_id.mk]
  Version bump to BP3A.250905.007.W1 [core/build_id.mk]
  Version bump to BP3A.250905.005.X5 [core/build_id.mk]
  Add apexd.mainline_patch_level_2 to PRODUCT_PACKAGES
  Version bump to BP3A.250905.009 [core/build_id.mk]
  Version bump to BP3A.250905.008 [core/build_id.mk]
  Version bump to BP3A.250905.005.X4 [core/build_id.mk]
  Version bump to BP3A.250905.005.Y1 [core/build_id.mk]
  Version bump to BP3A.250905.007 [core/build_id.mk]
  Version bump to BP3A.250905.005.X3 [core/build_id.mk]
  Version bump to BP3A.250905.005.X2 [core/build_id.mk]
  Version bump to BP3A.250905.005.X1 [core/build_id.mk]
  Version bump to BP3A.250905.006 [core/build_id.mk]
  Version bump to BP3A.250905.005 [core/build_id.mk]
  ...

Change-Id: I84161b0f013eb40002a433053b9383240274e9ea

1 files changed, 8 insertions, 5 deletions

diff --git a/tools/filelistdiff/file_list_diff.py b/tools/filelistdiff/file_list_diff.py
index a6408e87cc..e2b6fb7c71 100644
--- a/tools/filelistdiff/file_list_diff.py
+++ b/tools/filelistdiff/file_list_diff.py
@@ -42,17 +42,20 @@ def find_unique_items(kati_installed_files, soong_installed_files, system_module
 
     if unique_in_kati:
         print('')
-        print(f'{COLOR_ERROR}Missing required modules in {system_module_name} module.{COLOR_NORMAL}')
-        print(f'To resolve this issue, please add the modules to the Android.bp file for the {system_module_name} to install the following KATI only installed files.')
-        print(f'You can find the correct Android.bp file using the command "gomod {system_module_name}".')
+        print(f'{COLOR_ERROR}Missing required modules in the "{system_module_name}" module.{COLOR_NORMAL}')
+        print(f'To resolve this issue, please add the modules to the Android.bp file for the "{system_module_name}" to install the following KATI only installed files.')
+        print(f'You can find the Android.bp file using the command "gomod {system_module_name}".')
+        print('See build/make/tools/filelistdiff/README.md for more details.')
         print(f'{COLOR_WARNING}KATI only installed file(s):{COLOR_NORMAL}')
         for item in sorted(unique_in_kati):
             print('  '+item)
 
     if unique_in_soong:
         print('')
-        print(f'{COLOR_ERROR}Missing packages in base_system.mk.{COLOR_NORMAL}')
-        print('Please add packages into build/make/target/product/base_system.mk or build/make/tools/filelistdiff/allowlist to install or skip the following Soong only installed files.')
+        print(f'{COLOR_ERROR}Missing packages in PRODUCT_PACKAGES.{COLOR_NORMAL}')
+        print(f'Please add packages into .mk files or remove them from the "{system_module_name}" module in Android.bp file.')
+        print(f'You can find the Android.bp file using the command "gomod {system_module_name}".')
+        print('See build/make/tools/filelistdiff/README.md for more details.')
         print(f'{COLOR_WARNING}Soong only installed file(s):{COLOR_NORMAL}')
         for item in sorted(unique_in_soong):
             print('  '+item)