Use fs_config_generator.py to generate fs_config_files/dirs directly
We want to remove target specific host tools and since fs_config_generate is compiled with a target specific header file, we instead remove fs_config_generate entirely and allow python to build the fs_config_files/dirs files directly from config.fs files and parsed C headers. Test: associated unit tests and new end to end test Test: aosp_sailfish, aosp_crosshatch build produces valid fs_config files Test: aosp_cf_x86_phone build correctly produces empty fs_config files Change-Id: Idbc63ff56c0979e1e4c17721371de9d9d02dc8ff
This commit is contained in:
@@ -21,43 +21,3 @@ cc_binary_host {
|
||||
],
|
||||
cflags: ["-Werror"],
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// Unit tests.
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
test_c_flags = [
|
||||
"-fstack-protector-all",
|
||||
"-g",
|
||||
"-Wall",
|
||||
"-Wextra",
|
||||
"-Werror",
|
||||
"-fno-builtin",
|
||||
"-DANDROID_FILESYSTEM_CONFIG=\"android_filesystem_config_test_data.h\"",
|
||||
]
|
||||
|
||||
//#################################
|
||||
// test executable
|
||||
cc_test_host {
|
||||
name: "fs_config_generate_test",
|
||||
srcs: ["fs_config_generate.c"],
|
||||
shared_libs: ["libcutils"],
|
||||
cflags: test_c_flags,
|
||||
relative_install_path: "fs_config-unit-tests",
|
||||
no_named_install_directory: true,
|
||||
gtest: false,
|
||||
|
||||
}
|
||||
|
||||
//#################################
|
||||
// gTest tool
|
||||
cc_test_host {
|
||||
name: "fs_config-unit-tests",
|
||||
cflags: test_c_flags + ["-DHOST"],
|
||||
shared_libs: [
|
||||
"liblog",
|
||||
"libcutils",
|
||||
"libbase",
|
||||
],
|
||||
srcs: ["fs_config_test.cpp"],
|
||||
}
|
||||
|
Reference in New Issue
Block a user