Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2470ef09 authored by Tom Cherry's avatar Tom Cherry Committed by Automerger Merge Worker
Browse files

Merge "Use libcutils_headers for android_filesystem_config.h" am: 787ef71f 

Original change: https://android-review.googlesource.com/c/platform/build/+/1430228

Change-Id: I3632573a131374139ff9c9a9e9607f14944a6c18
parents 9c5f12ca 787ef71f

tools/fs_config/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ ifneq ($(wildcard $(TARGET_DEVICE_DIR)/android_filesystem_config.h),) 
$(error Using $(TARGET_DEVICE_DIR)/android_filesystem_config.h is deprecated, please use TARGET_FS_CONFIG_GEN instead)

endif



system_android_filesystem_config := system/core/include/private/android_filesystem_config.h

system_android_filesystem_config := system/core/libcutils/include/private/android_filesystem_config.h

system_capability_header := bionic/libc/kernel/uapi/linux/capability.h



# List of supported vendor, oem, odm, vendor_dlkm, odm_dlkm, product and system_ext Partitions

tools/fs_config/end_to_end_test/run_test.sh

+6 −6
Original line number Diff line number Diff line 
cd $ANDROID_BUILD_TOP/build/make/tools/fs_config/end_to_end_test



$ANDROID_BUILD_TOP/build/make/tools/fs_config/fs_config_generator.py fsconfig \

  --aid-header $ANDROID_BUILD_TOP/system/core/include/private/android_filesystem_config.h \

  --aid-header $ANDROID_BUILD_TOP/system/core/libcutils/include/private/android_filesystem_config.h \

  --capability-header $ANDROID_BUILD_TOP/bionic/libc/kernel/uapi/linux/capability.h \

  --partition system \

  --all-partitions vendor,product \
@@ -13,7 +13,7 @@ diff system_fs_config_files result_system_fs_config_files 1>/dev/null && echo 'S 
  echo 'Fail: Mismatch between system_fs_config_files and result_system_fs_config_files'



$ANDROID_BUILD_TOP/build/make/tools/fs_config/fs_config_generator.py fsconfig \

  --aid-header $ANDROID_BUILD_TOP/system/core/include/private/android_filesystem_config.h \

  --aid-header $ANDROID_BUILD_TOP/system/core/libcutils/include/private/android_filesystem_config.h \

  --capability-header $ANDROID_BUILD_TOP/bionic/libc/kernel/uapi/linux/capability.h \

  --partition system \

  --all-partitions vendor,product \
@@ -25,7 +25,7 @@ diff system_fs_config_dirs result_system_fs_config_dirs 1>/dev/null && echo 'Suc 
  echo 'Fail: Mismatch between system_fs_config_dirs and result_system_fs_config_dirs'



$ANDROID_BUILD_TOP/build/make/tools/fs_config/fs_config_generator.py fsconfig \

  --aid-header $ANDROID_BUILD_TOP/system/core/include/private/android_filesystem_config.h \

  --aid-header $ANDROID_BUILD_TOP/system/core/libcutils/include/private/android_filesystem_config.h \

  --capability-header $ANDROID_BUILD_TOP/bionic/libc/kernel/uapi/linux/capability.h \

  --partition vendor \

  --files \
@@ -36,7 +36,7 @@ diff vendor_fs_config_files result_vendor_fs_config_files 1>/dev/null && echo 'S 
  echo 'Fail: Mismatch between vendor_fs_config_files and result_vendor_fs_config_files'



$ANDROID_BUILD_TOP/build/make/tools/fs_config/fs_config_generator.py fsconfig \

  --aid-header $ANDROID_BUILD_TOP/system/core/include/private/android_filesystem_config.h \

  --aid-header $ANDROID_BUILD_TOP/system/core/libcutils/include/private/android_filesystem_config.h \

  --capability-header $ANDROID_BUILD_TOP/bionic/libc/kernel/uapi/linux/capability.h \

  --partition vendor \

  --dirs \
@@ -47,7 +47,7 @@ diff vendor_fs_config_dirs result_vendor_fs_config_dirs 1>/dev/null && echo 'Suc 
  echo 'Fail: Mismatch between vendor_fs_config_dirs and result_vendor_fs_config_dirs'



$ANDROID_BUILD_TOP/build/make/tools/fs_config/fs_config_generator.py fsconfig \

  --aid-header $ANDROID_BUILD_TOP/system/core/include/private/android_filesystem_config.h \

  --aid-header $ANDROID_BUILD_TOP/system/core/libcutils/include/private/android_filesystem_config.h \

  --capability-header $ANDROID_BUILD_TOP/bionic/libc/kernel/uapi/linux/capability.h \

  --partition product \

  --files \
@@ -58,7 +58,7 @@ diff product_fs_config_files result_product_fs_config_files 1>/dev/null && echo 
  echo 'Fail: Mismatch between product_fs_config_files and result_product_fs_config_files'



$ANDROID_BUILD_TOP/build/make/tools/fs_config/fs_config_generator.py fsconfig \

  --aid-header $ANDROID_BUILD_TOP/system/core/include/private/android_filesystem_config.h \

  --aid-header $ANDROID_BUILD_TOP/system/core/libcutils/include/private/android_filesystem_config.h \

  --capability-header $ANDROID_BUILD_TOP/bionic/libc/kernel/uapi/linux/capability.h \

  --partition product \

  --dirs \