commit ebfe9d026917e86f6f90f29f079e9600c28dc160
author Allen Webb <allenwebb@google.com> Wed Oct 18 10:09:42 2017 -0700
committer Allen Webb <allenwebb@google.com> Wed Oct 18 10:09:42 2017 -0700
tree 41597042684c570b13c73fc50faffe0f4d61cada
parent 92b54a311477f7ecfc05b86b4d86bd0aca9bc33e

Fixes to the android build for recent changes.

Change-Id: I131bfd826c52aef4707929e4608065245d43592d

Android.bp

diff --git a/Android.bp b/Android.bp
index 3e26900..07de74b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -29,9 +29,11 @@
         "src/keymaster_tests.cc",
         "src/nugget_core_tests.cc",
         "src/runtests.cc",
+        "src/test-data/test-keys/rsa.cc",
         "src/util.cc",
         "src/weaver_tests.cc",
     ],
+    include_dirs: ["."],
     header_libs: [
         "nos_headers",
     ],

tools/Android.bp

diff --git a/tools/Android.bp b/tools/Android.bp
index 708d826..b8a26cf 100644
--- a/tools/Android.bp
+++ b/tools/Android.bp
@@ -19,6 +19,9 @@
     srcs: [
         "nugget_tools.cc",
     ],
+    header_libs: [
+        "nos_headers",
+    ],
     shared_libs: [
         "libnos",
         "libnos_client_citadel",