commit f1892d0d1d3184ad39cee9c0d9b3a4c0842ec7f9
author Yi Kong <yikong@google.com> Tue May 09 13:35:12 2017 -0700
committer Yi Kong <yikong@google.com> Tue May 09 13:35:12 2017 -0700
tree a690ce7983e46fbdaa6859e9eb0197487d07d54f
parent fc288ff9a825353b7c373eebfdf7180eb5cd46c7
parent cdbe1e7da1fdb541624029a4ffc768cf2db3e849

resolve merge conflicts of cdbe1e7 to master

Test: Build
Change-Id: I3252b50b9f9ace04675cd60140b1356fbf1a2bd4

apps/weaver/Android.bp

diff --git a/apps/weaver/Android.bp b/apps/weaver/Android.bp
index 611d870..7c4312b 100644
--- a/apps/weaver/Android.bp
+++ b/apps/weaver/Android.bp
@@ -26,6 +26,7 @@
     defaults: ["libese-app-defaults"],
     srcs: ["tests/weaver_test.cpp"],
     shared_libs: [
+        "libese",
         "libese-app-weaver",
         "libese_cpp_nxp_pn80t_nq_nci",
     ],

esed/Android.bp

diff --git a/esed/Android.bp b/esed/Android.bp
index 43af96d..c5a2005 100644
--- a/esed/Android.bp
+++ b/esed/Android.bp
@@ -45,6 +45,7 @@
     shared_libs: [
         "android.hardware.weaver@1.0",
         "android.hardware.oemlock@1.0",
+        "libese",
         "libbase",
         "libese-app-boot",
         "libese_cpp_nxp_pn80t_nq_nci",