Merge "Fix sandboxing errors in hidl tests" into main am: f078f7a19c

Original change: https://android-review.googlesource.com/c/platform/system/tools/hidl/+/2747536

Change-Id: Ifc9d2e0b2e7a3810cd70ec93acaab816772069d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9 files changed, 90 insertions, 50 deletions

diff --git a/c2hal/test/Android.bp b/c2hal/test/Android.bp
index 4e69de67..0aabd856 100644
--- a/c2hal/test/Android.bp
+++ b/c2hal/test/Android.bp
@@ -29,13 +29,14 @@ genrule {
         "hidl-gen",
     ],
     cmd: "$(location c2hal) -o $(genDir)/c2hal_test/1.0 " +
-         "    -p android.hardware.c2hal_test@1.0 $(in) && " +
-         "$(location hidl-gen) -o $(genDir) -Lc++ " +
-         "    -r android.hardware:$(genDir) " +
-         "    -r android.hidl:system/libhidl/transport " +
-         "    android.hardware.c2hal_test@1.0",
+        "    -p android.hardware.c2hal_test@1.0 $(location simple.h) && " +
+        "$(location hidl-gen) -o $(genDir) -Lc++ " +
+        "    -r android.hardware:$(genDir) " +
+        "    -r android.hidl:system/libhidl/transport " +
+        "    android.hardware.c2hal_test@1.0",
     srcs: [
         "simple.h",
+        ":android.hidl.base@1.0_hal",
     ],
     out: [
         "android/hardware/c2hal_test/1.0/BnHwSimple.h",
@@ -60,13 +61,14 @@ genrule {
         "hidl-gen",
     ],
     cmd: "$(location c2hal) -o $(genDir)/c2hal_test/1.0 " +
-         "    -p android.hardware.c2hal_test@1.0 $(in) && " +
-         "$(location hidl-gen) -o $(genDir) -Lc++ " +
-         "    -r android.hardware:$(genDir) " +
-         "    -r android.hidl:system/libhidl/transport " +
-         "    android.hardware.c2hal_test@1.0",
+        "    -p android.hardware.c2hal_test@1.0 $(location simple.h) && " +
+        "$(location hidl-gen) -o $(genDir) -Lc++ " +
+        "    -r android.hardware:$(genDir) " +
+        "    -r android.hidl:system/libhidl/transport " +
+        "    android.hardware.c2hal_test@1.0",
     srcs: [
         "simple.h",
+        ":android.hidl.base@1.0_hal",
     ],
     out: [
         "android/hardware/c2hal_test/1.0/SimpleAll.cpp",
diff --git a/hidl2aidl/test/2.0/Android.bp b/hidl2aidl/test/2.0/Android.bp
new file mode 100644
index 00000000..a3e140e0
--- /dev/null
+++ b/hidl2aidl/test/2.0/Android.bp
@@ -0,0 +1,22 @@
+
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "system_tools_hidl_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["system_tools_hidl_license"],
+}
+
+hidl_interface {
+    name: "hidl2aidl.test@2.0",
+    root: "hidl2aidl.test",
+    srcs: [
+        "IFoo.hal",
+    ],
+    interfaces: [
+        "android.hidl.base@1.0",
+        "hidl2aidl.test@1.0",
+    ],
+    gen_java: true,
+}
diff --git a/hidl2aidl/test/Android.bp b/hidl2aidl/test/Android.bp
index 408baef3..5b6412fc 100644
--- a/hidl2aidl/test/Android.bp
+++ b/hidl2aidl/test/Android.bp
@@ -40,6 +40,13 @@ genrule_defaults {
         "mv $(genDir)/include/hidl2aidl/test/extension/translate-ndk.h $(genDir)/hidl2aidl/test/extension/ && " +
         "mv $(genDir)/include/hidl2aidl/test/extension/translate-cpp.h $(genDir)/hidl2aidl/test/extension/ ",
     srcs: [
+        ":android.hidl.base@1.0_hal",
+        ":android.hidl.safe_union@1.0_hal",
+        ":hidl2aidl.test@1.0_hal",
+        ":hidl2aidl.test@1.1_hal",
+        ":hidl2aidl.test@1.2_hal",
+        ":hidl2aidl.test@2.0_hal",
+        ":hidl2aidl.test.extension@1.2_hal",
         "1.0/IBar.hal",
         "1.0/IFoo.hal",
         "1.0/types.hal",
diff --git a/test/error_test/Android.bp b/test/error_test/Android.bp
index 03bc45f8..fc09069c 100644
--- a/test/error_test/Android.bp
+++ b/test/error_test/Android.bp
@@ -15,6 +15,7 @@ genrule {
          "echo 'int main(){return 0;}' > $(genDir)/TODO_b_37575883.cpp",
     out: ["TODO_b_37575883.cpp"],
     srcs: [
+        ":android.hidl.base@1.0_hal",
         "**/*.hal",
         "**/required_error",
     ],
diff --git a/test/export_test/Android.bp b/test/export_test/Android.bp
index 7317e1af..b52415b3 100644
--- a/test/export_test/Android.bp
+++ b/test/export_test/Android.bp
@@ -14,7 +14,8 @@ genrule {
     ],
     srcs: [
         "1.0/IFoo.hal",
-        "1.0/types.hal"
+        "1.0/types.hal",
+        ":android.hidl.base@1.0_hal",
     ],
     cmd: "$(location hidl-gen) -o $(genDir)/export-base.h -Lexport-header " +
          "-rexport:system/tools/hidl/test/export_test export@1.0",
diff --git a/test/format_test/Android.bp b/test/format_test/Android.bp
index 62b14661..957274f0 100644
--- a/test/format_test/Android.bp
+++ b/test/format_test/Android.bp
@@ -29,9 +29,10 @@ genrule {
     cmd: "$(location hidl-gen) -L format -o $(genDir)/ " +
         "-r hidl_format_test_pkg:system/tools/hidl/test/format_test " +
         "hidl_format_test_pkg@1.0 && " +
-        "cp $$(dirname $(in) | uniq)/Android.bp $(genDir)/system/tools/hidl/test/format_test/1.0 && " +
-        "diff -r -C3 $(genDir)/system/tools/hidl/test/format_test/1.0 $$(dirname $(in) | uniq)",
+        "cp $$(dirname $(location 1.0/IBar.hal) | uniq)/Android.bp $(genDir)/system/tools/hidl/test/format_test/1.0 && " +
+        "diff -r -C3 $(genDir)/system/tools/hidl/test/format_test/1.0 $$(dirname $(location 1.0/IBar.hal) | uniq)",
     srcs: [
+        ":android.hidl.base@1.0_hal",
         "1.0/Android.bp",
         "1.0/IBar.hal",
         "1.0/IFoo.hal",
diff --git a/test/hash_test/Android.bp b/test/hash_test/Android.bp
index b58a058c..3973d6c9 100644
--- a/test/hash_test/Android.bp
+++ b/test/hash_test/Android.bp
@@ -12,26 +12,26 @@ genrule {
     tools: [
         "hidl-gen",
     ],
-    cmd: "$(location hidl-gen) -L check " +
+    cmd: "set +o pipefail; $(location hidl-gen) -L check " +
         "    -r android.hidl:system/libhidl/transport" +
         "    -r test.hash:system/tools/hidl/test/hash_test/correct_hash" +
         "    test.hash.hash@1.0" +
-        "&&" +
+        " && " +
         "!($(location hidl-gen) -F -L check " +
         "    -r android.hidl:system/libhidl/transport" +
         "    -r test.hash:system/tools/hidl/test/hash_test/missing_hash" +
         "    test.hash.hash@1.0 2> /dev/null)" +
-        "&&" +
+        " && " +
         "!($(location hidl-gen) -L check " +
         "    -r android.hidl:system/libhidl/transport" +
         "    -r test.hash:system/tools/hidl/test/hash_test/incorrect_hash" +
         "    test.hash.hash@1.0 2> /dev/null)" +
-        "&&" +
+        " && " +
         "$(location hidl-gen) -L hash " +
         "    -r android.hidl:system/libhidl/transport" +
         "    -r test.hash:system/tools/hidl/test/hash_test/incorrect_hash" +
         "    test.hash.hash@1.0 > /dev/null" +
-        "&&" +
+        " && " +
         "echo 'int main(){return 0;}' > $(genDir)/TODO_b_37575883.cpp",
     out: ["TODO_b_37575883.cpp"],
 
@@ -41,6 +41,8 @@ genrule {
         "incorrect_hash/current.txt",
         "incorrect_hash/hash/1.0/IHash.hal",
         "missing_hash/hash/1.0/IUnhashed.hal",
+        ":android.hidl",
+        ":android.hidl.base@1.0_hal",
     ],
 }
 
diff --git a/test/java_impl_test/Android.bp b/test/java_impl_test/Android.bp
index b9d274a9..571b6b92 100644
--- a/test/java_impl_test/Android.bp
+++ b/test/java_impl_test/Android.bp
@@ -28,7 +28,10 @@ java_genrule {
     tools: [
         "hidl-gen",
     ],
-    srcs: [":android.hardware.tests.baz@1.0_hal"],
+    srcs: [
+        ":android.hardware.tests.baz@1.0_hal",
+        ":android.hidl.base@1.0_hal",
+    ],
     cmd: "$(location hidl-gen) -o $(genDir) -Ljava-impl android.hardware.tests.baz@1.0",
     out: [
         "Base.java",
diff --git a/test/version_test/Android.bp b/test/version_test/Android.bp
index f5796576..09e62ca3 100644
--- a/test/version_test/Android.bp
+++ b/test/version_test/Android.bp
@@ -12,40 +12,41 @@ genrule {
     tools: [
         "hidl-gen",
     ],
-    cmd: "$(location hidl-gen) -L check " +
-         "    -r test.version:system/tools/hidl/test/version_test/good" +
-         "    test.version.version@1.0" +
-         "    test.version.version@2.2" +
-         "    test.version.version@2.3" +
-         "    test.version.version@2.4" +
-         "    test.version.version@2.5" +
-         "    test.version.version@3.0" +
-         "    test.version.version@3.1" +
-         "&&" +
-         "($(location hidl-gen) -L check " +
-         "    -r test.version:system/tools/hidl/test/version_test/bad1" +
-         "    test.version.version@2.3 2>&1 | grep \"Cannot enforce minor version\" > /dev/null)" +
-         "&&" +
-         "($(location hidl-gen) -L check " +
-         "    -r test.version:system/tools/hidl/test/version_test/bad2" +
-         "    test.version.version@2.4 2>&1 | grep \"Cannot enforce minor version\" > /dev/null)" +
-         "&&" +
-         "($(location hidl-gen) -L check " +
-         "    -r test.version:system/tools/hidl/test/version_test/bad3" +
-         "    test.version.version@2.5 2>&1 | grep \"Cannot enforce minor version\" > /dev/null)" +
-         "&&" +
-         "($(location hidl-gen) -L check " +
-         "    -r test.version:system/tools/hidl/test/version_test/bad4" +
-         "    test.version.version@2.3 2>&1 | grep \"doesn't pass minor version\" > /dev/null)" +
-         "&&" +
-         "($(location hidl-gen) -L check " +
-         "    -r test.version:system/tools/hidl/test/version_test/bad5" +
-         "    test.version.version@2.3 2>&1 | grep \"doesn't pass minor version\" > /dev/null)" +
-         "&&" +
-         "echo 'int main(){return 0;}' > $(genDir)/TODO_b_37575883.cpp",
+    cmd: "set +o pipefail; $(location hidl-gen) -L check " +
+        "    -r test.version:system/tools/hidl/test/version_test/good" +
+        "    test.version.version@1.0" +
+        "    test.version.version@2.2" +
+        "    test.version.version@2.3" +
+        "    test.version.version@2.4" +
+        "    test.version.version@2.5" +
+        "    test.version.version@3.0" +
+        "    test.version.version@3.1" +
+        "&&" +
+        "($(location hidl-gen) -L check " +
+        "    -r test.version:system/tools/hidl/test/version_test/bad1" +
+        "    test.version.version@2.3 2>&1 | grep \"Cannot enforce minor version\" > /dev/null)" +
+        "&&" +
+        "($(location hidl-gen) -L check " +
+        "    -r test.version:system/tools/hidl/test/version_test/bad2" +
+        "    test.version.version@2.4 2>&1 | grep \"Cannot enforce minor version\" > /dev/null)" +
+        "&&" +
+        "($(location hidl-gen) -L check " +
+        "    -r test.version:system/tools/hidl/test/version_test/bad3" +
+        "    test.version.version@2.5 2>&1 | grep \"Cannot enforce minor version\" > /dev/null)" +
+        "&&" +
+        "($(location hidl-gen) -L check " +
+        "    -r test.version:system/tools/hidl/test/version_test/bad4" +
+        "    test.version.version@2.3 2>&1 | grep \"doesn't pass minor version\" > /dev/null)" +
+        "&&" +
+        "($(location hidl-gen) -L check " +
+        "    -r test.version:system/tools/hidl/test/version_test/bad5" +
+        "    test.version.version@2.3 2>&1 | grep \"doesn't pass minor version\" > /dev/null)" +
+        "&&" +
+        "echo 'int main(){return 0;}' > $(genDir)/TODO_b_37575883.cpp",
     out: ["TODO_b_37575883.cpp"],
 
     srcs: [
+        ":android.hidl.base@1.0_hal",
         "bad1/version/1.0/IFoo.hal",
         "bad1/version/2.2/IBar.hal",
         "bad1/version/2.3/IBar.hal",