Merge "Remove unnecessary folders in error_test"
diff --git a/test/error_test/Android.bp b/test/error_test/Android.bp
index bd5c076..edc639f 100644
--- a/test/error_test/Android.bp
+++ b/test/error_test/Android.bp
@@ -3,45 +3,39 @@
tools: [
"hidl-gen",
],
- cmd: "!($(location hidl-gen) -L check " +
- " -r test.error:system/tools/hidl/test/error_test/interface_semicolon" +
- " test.error.error@1.0 >/dev/null 2>&1)" +
+ cmd: "!($(location hidl-gen) -L check -r test:system/tools/hidl/test/error_test" +
+ " test.interface_semicolon@1.0 >/dev/null 2>&1)" +
"&&" +
- "!($(location hidl-gen) -L check " +
- " -r test.error:system/tools/hidl/test/error_test/method_ends_in_semicolon" +
- " test.error.error@1.0 >/dev/null 2>&1)" +
+ "!($(location hidl-gen) -L check -r test:system/tools/hidl/test/error_test" +
+ " test.method_ends_in_semicolon@1.0 >/dev/null 2>&1)" +
"&&" +
- "!($(location hidl-gen) -L check " +
- " -r test.error:system/tools/hidl/test/error_test/no_data_outside_interface" +
- " test.error.error@1.0 >/dev/null 2>&1)" +
+ "!($(location hidl-gen) -L check -r test:system/tools/hidl/test/error_test" +
+ " test.no_data_outside_interface@1.0 >/dev/null 2>&1)" +
"&&" +
- "!($(location hidl-gen) -L check " +
- " -r test.error:system/tools/hidl/test/error_test/no_interface_in_types" +
- " test.error.error@1.0 >/dev/null 2>&1)" +
+ "!($(location hidl-gen) -L check -r test:system/tools/hidl/test/error_test" +
+ " test.no_interface_in_types@1.0 >/dev/null 2>&1)" +
"&&" +
- "!($(location hidl-gen) -L check " +
- " -r test.error:system/tools/hidl/test/error_test/no_two_interfaces" +
- " test.error.error@1.0 >/dev/null 2>&1)" +
+ "!($(location hidl-gen) -L check -r test:system/tools/hidl/test/error_test" +
+ " -r test.error:system/tools/hidl/test/error_test/" +
+ " test.no_two_interfaces@1.0 >/dev/null 2>&1)" +
"&&" +
- "!($(location hidl-gen) -L check " +
- " -r test.error:system/tools/hidl/test/error_test/same_name_interface" +
- " test.error.error@1.0 >/dev/null 2>&1)" +
+ "!($(location hidl-gen) -L check -r test:system/tools/hidl/test/error_test" +
+ " test.same_name_interface@1.0 >/dev/null 2>&1)" +
"&&" +
- "!($(location hidl-gen) -L check " +
- " -r test.error:system/tools/hidl/test/error_test/same_package_name" +
- " test.error.error@1.0 >/dev/null 2>&1)" +
+ "!($(location hidl-gen) -L check -r test:system/tools/hidl/test/error_test" +
+ " test.same_package_name@1.0 >/dev/null 2>&1)" +
"&&" +
"echo 'int main(){return 0;}' > $(genDir)/TODO_b_37575883.cpp",
out: ["TODO_b_37575883.cpp"],
srcs: [
- "interface_semicolon/error/1.0/IFoo.hal",
- "method_ends_in_semicolon/error/1.0/IFoo.hal",
- "no_data_outside_interface/error/1.0/IFoo.hal",
- "no_interface_in_types/error/1.0/IFoo.hal",
- "no_interface_in_types/error/1.0/types.hal",
- "no_two_interfaces/error/1.0/IFoo.hal",
- "same_name_interface/error/1.0/IFoo.hal",
- "same_package_name/error/1.0/IFoo.hal",
+ "interface_semicolon/1.0/IFoo.hal",
+ "method_ends_in_semicolon/1.0/IFoo.hal",
+ "no_data_outside_interface/1.0/IFoo.hal",
+ "no_interface_in_types/1.0/IFoo.hal",
+ "no_interface_in_types/1.0/types.hal",
+ "no_two_interfaces/1.0/IFoo.hal",
+ "same_name_interface/1.0/IFoo.hal",
+ "same_package_name/1.0/IFoo.hal",
],
}
diff --git a/test/error_test/interface_semicolon/error/1.0/IFoo.hal b/test/error_test/interface_semicolon/1.0/IFoo.hal
similarity index 100%
rename from test/error_test/interface_semicolon/error/1.0/IFoo.hal
rename to test/error_test/interface_semicolon/1.0/IFoo.hal
diff --git a/test/error_test/method_ends_in_semicolon/error/1.0/IFoo.hal b/test/error_test/method_ends_in_semicolon/1.0/IFoo.hal
similarity index 100%
rename from test/error_test/method_ends_in_semicolon/error/1.0/IFoo.hal
rename to test/error_test/method_ends_in_semicolon/1.0/IFoo.hal
diff --git a/test/error_test/no_data_outside_interface/error/1.0/IFoo.hal b/test/error_test/no_data_outside_interface/1.0/IFoo.hal
similarity index 100%
rename from test/error_test/no_data_outside_interface/error/1.0/IFoo.hal
rename to test/error_test/no_data_outside_interface/1.0/IFoo.hal
diff --git a/test/error_test/no_interface_in_types/error/1.0/IFoo.hal b/test/error_test/no_interface_in_types/1.0/IFoo.hal
similarity index 100%
rename from test/error_test/no_interface_in_types/error/1.0/IFoo.hal
rename to test/error_test/no_interface_in_types/1.0/IFoo.hal
diff --git a/test/error_test/no_interface_in_types/error/1.0/types.hal b/test/error_test/no_interface_in_types/1.0/types.hal
similarity index 100%
rename from test/error_test/no_interface_in_types/error/1.0/types.hal
rename to test/error_test/no_interface_in_types/1.0/types.hal
diff --git a/test/error_test/no_two_interfaces/error/1.0/IFoo.hal b/test/error_test/no_two_interfaces/1.0/IFoo.hal
similarity index 100%
rename from test/error_test/no_two_interfaces/error/1.0/IFoo.hal
rename to test/error_test/no_two_interfaces/1.0/IFoo.hal
diff --git a/test/error_test/same_name_interface/error/1.0/IFoo.hal b/test/error_test/same_name_interface/1.0/IFoo.hal
similarity index 100%
rename from test/error_test/same_name_interface/error/1.0/IFoo.hal
rename to test/error_test/same_name_interface/1.0/IFoo.hal
diff --git a/test/error_test/same_package_name/error/1.0/IFoo.hal b/test/error_test/same_package_name/1.0/IFoo.hal
similarity index 100%
rename from test/error_test/same_package_name/error/1.0/IFoo.hal
rename to test/error_test/same_package_name/1.0/IFoo.hal