Fix a build error reguarding build_sepolicy
build_sepolicy internally uses other tools like checkpolicy and
version_policy. The dependencies are used to be found under
out/host/linux-x86/bin. But that assumption doesn't hold when soong
tried to sandbox command invocations. This change fixes the problem by
setting --android_host_path to the directory where build_sepolicy is
sandboxed and also by adding the internal dependeicies to the `tools`
property so that they are copied to the sandbox directory.
Bug: N/A
Test: choosecombo into aosp_x86_64 and run
m out/soong/.intermediates/system/sepolicy/microdroid_vendor_sepolicy.cil_gen/gen/vendor_sepolicy.cil
Change-Id: I28ae1f9013439f3ca1196b3816e0388ced5246e1
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 " +