summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Vakulenko <avakulenko@google.com>2015-10-19 11:21:00 -0700
committerAlex Vakulenko <avakulenko@google.com>2015-10-19 11:21:00 -0700
commite4eff114cb9b4a79573820865e109a50f0e2e0c4 (patch)
tree0b3993530225c68265b2b8c0c2078a450b5c6759
parent9f01b702ae6c852cf800a7156b15040b92fad94b (diff)
downloadtpm-e4eff114cb9b4a79573820865e109a50f0e2e0c4.tar.gz
Fixed build breaks on ChromeOS
libminijail.h is not in libchrome/brillo actually, but since C++ wrapper already includes libminijail.h, there is no need to explicitly include it here. Also, fixed the destination for libtrunks_test.a BUG: 24872993 Change-Id: I3123d6a96e7193b3345ee158089524cd4f0c31d3
-rw-r--r--trunks.gyp1
-rw-r--r--trunksd.cc1
2 files changed, 1 insertions, 1 deletions
diff --git a/trunks.gyp b/trunks.gyp
index 591a265..4203bc5 100644
--- a/trunks.gyp
+++ b/trunks.gyp
@@ -85,6 +85,7 @@
{
'target_name': 'trunks_test',
'type': 'static_library',
+ 'standalone_static_library': 1,
'sources': [
'mock_authorization_delegate.cc',
'mock_blob_parser.cc',
diff --git a/trunksd.cc b/trunksd.cc
index 7e87aa4..4c7b05f 100644
--- a/trunksd.cc
+++ b/trunksd.cc
@@ -21,7 +21,6 @@
#include <base/command_line.h>
#include <base/threading/thread.h>
#include <brillo/daemons/dbus_daemon.h>
-#include <brillo/libminijail.h>
#include <brillo/minijail/minijail.h>
#include <brillo/syslog_logging.h>
#include <brillo/userdb_utils.h>