diff options
| -rw-r--r-- | tools/fs_config/Android.mk | 2 | ||||
| -rwxr-xr-x | tools/fs_config/end_to_end_test/run_test.sh | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tools/fs_config/Android.mk b/tools/fs_config/Android.mk index 41e8ca5664..5fb68b8035 100644 --- a/tools/fs_config/Android.mk +++ b/tools/fs_config/Android.mk @@ -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 diff --git a/tools/fs_config/end_to_end_test/run_test.sh b/tools/fs_config/end_to_end_test/run_test.sh index 74022766c6..b5a7e83251 100755 --- a/tools/fs_config/end_to_end_test/run_test.sh +++ b/tools/fs_config/end_to_end_test/run_test.sh @@ -1,7 +1,7 @@ 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 \ |