commit 1bc235e5628f080c0130624f49cdbc671f75a946
author Treehugger Robot <treehugger-gerrit@google.com> Thu May 14 20:06:24 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 14 20:06:24 2020 +0000
tree c727bd75843b3207fc710e9c50e468dcd767a221
parent ec9425eaccdc046685632ab61088c485cd5dd499
parent 65667f870a79f56cff754ff4a2395bf663648e93

Merge "Add host_supported to some Keymaster libraries."

Android.bp

diff --git a/Android.bp b/Android.bp
index 3ce107c..fb69928 100644
--- a/Android.bp
+++ b/Android.bp
@@ -54,6 +54,14 @@
     ],
     stl: "none",
     export_include_dirs: ["include"],
+    host_supported: true,
+    target: {
+        host: {
+            clang_cflags: [
+                "-fno-rtti", // TODO(b/156427382): Remove workaround when possible.
+            ],
+        },
+    },
 }
 
 // libkeymaster_portable contains almost everything needed for a keymaster
@@ -124,7 +132,15 @@
     // weakly defines the subset of stl symbols required for this library to work
     // and which are also available in the trusty context.
     stl: "none",
+    host_supported: true,
     export_include_dirs: ["include"],
+    target: {
+        host: {
+            clang_cflags: [
+                "-fno-rtti", // TODO(b/156427382): Remove workaround when possible.
+            ],
+        },
+    },
 }
 
 // libsoftkeymaster provides a software-based keymaster HAL implementation.
@@ -172,6 +188,7 @@
         "libkeymaster_portable",
     ],
 
+    host_supported: true,
     export_include_dirs: ["include"],
 }
 
@@ -193,7 +210,6 @@
         "libcutils",
         "libbase",
     ],
-
     export_include_dirs: ["include"],
 }