commit 6d686413589aba862ff242b1d6138543e2ced025
author android-build-team Robot <android-build-team-robot@google.com> Thu Apr 26 07:24:53 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Apr 26 07:24:53 2018 +0000
tree 4fc20bd904b113c9c4406d55d2a76e33337081df
parent 4fbb36d1db32a098127f5b52bbad7973f9122b24
parent 8cb0dee4f17433d883b5029873dd555270f3dcab

Snap for 4745538 from 8cb0dee4f17433d883b5029873dd555270f3dcab to pi-release

Change-Id: I29e871b4fd3b068a7992b4031d5ef4aa190040d2

Android.bp

diff --git a/Android.bp b/Android.bp
index a52439e..cdda3c8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -114,6 +114,7 @@
 // =========================================================
 cc_library {
     name: "libminijail",
+    host_supported: true,
 
     vendor_available: true,
     vndk: {
@@ -132,6 +133,14 @@
         shared_libs: minijailCommonLibraries,
     },
     export_include_dirs: ["."],
+
+    target: {
+        host: {
+            cflags: [
+                "-DPRELOADPATH=\"/invalidminijailpreload.so\"",
+            ],
+        },
+    },
 }
 
 // Example ASan-ified libminijail shared library for target.
@@ -341,6 +350,7 @@
 cc_binary {
     name: "minijail0",
     defaults: ["libminijail_flags"],
+    host_supported: true,
 
     cflags: [
         "-DPRELOADPATH=\"/invalidminijailpreload.so\"",