summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2019-09-23 09:57:00 -0700
committer android-build-merger <android-build-merger@google.com> 2019-09-23 09:57:00 -0700
commit400c091a441f19ad80c0aca44ecdcf0f12c4c090 (patch)
tree5a22936f0b93ad633acb6391cd19d66f8796060d
parentb3db5ef1e9fb4687bfec4131199327c8aac78ff6 (diff)
parentc1e240aa7a27cfab9b7f61b3a9a1487a77ecfe80 (diff)
Merge "Host users of libutils trace use libcutils." am: 4a17a712f5 am: 330c15e273 am: fb59c94709
am: c1e240aa7a Change-Id: I507ef7554513ad0221b6fa95b2854c9066e8f9f3
-rw-r--r--cmds/idmap2/Android.bp3
-rw-r--r--startop/view_compiler/Android.bp1
2 files changed, 4 insertions, 0 deletions
diff --git a/cmds/idmap2/Android.bp b/cmds/idmap2/Android.bp
index d4d587108a54..4c77ba402595 100644
--- a/cmds/idmap2/Android.bp
+++ b/cmds/idmap2/Android.bp
@@ -69,6 +69,7 @@ cc_library {
static_libs: [
"libandroidfw",
"libbase",
+ "libcutils",
"libutils",
"libziparchive",
],
@@ -121,6 +122,7 @@ cc_test {
static_libs: [
"libandroidfw",
"libbase",
+ "libcutils",
"libidmap2",
"liblog",
"libutils",
@@ -163,6 +165,7 @@ cc_binary {
static_libs: [
"libandroidfw",
"libbase",
+ "libcutils",
"libidmap2",
"liblog",
"libutils",
diff --git a/startop/view_compiler/Android.bp b/startop/view_compiler/Android.bp
index 4f6524e0528b..c380d291d573 100644
--- a/startop/view_compiler/Android.bp
+++ b/startop/view_compiler/Android.bp
@@ -25,6 +25,7 @@ cc_defaults {
"slicer",
],
static_libs: [
+ "libcutils",
"libtinyxml2",
"liblog",
"libutils",