commit 05a80a5e72eb796b68a191becdf5a013ed8b47a9
author Jiyong Park <jiyong@google.com> Fri Mar 05 02:32:15 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 05 02:32:15 2021 +0000
tree 7904b102dab034a0baf091534986f7a6696f1688
parent 1e2a1b6e045d6a19c010d0e8c9c64b3aabf5fa5d
parent cc9a09953b09c27e478725e5862f5616375f74f6

Merge "Fix a build error reguarding build_sepolicy"

Android.bp

diff --git a/Android.bp b/Android.bp
index 7500887..8fa57ca 100644
--- a/Android.bp
+++ b/Android.bp
@@ -697,11 +697,17 @@
         ":microdroid_pub_policy.cil_gen",
         ":microdroid_reqd_policy_mask.cil_gen",
     ],
-    tools: ["m4", "build_sepolicy"],
+    tools: [
+        "m4",
+        "build_sepolicy",
+        "checkpolicy",
+        "secilc",
+        "version_policy",
+    ],
     out: ["vendor_sepolicy.cil"],
     cmd: policy_to_conf_flags + " -s $(locations :microdroid_vendor_sepolicy_build_files) > $(out).conf && " +
         "$(location build_sepolicy) " +
-        "--android_host_path out/host/linux-x86/bin " +
+        "--android_host_path $$(dirname $(location build_sepolicy)) " +
         "build_cil " +
         "--input_policy_conf $(out).conf " +
         "--checkpolicy_env ASAN_OPTIONS=detect_leaks=0 " +