| commit | 0435093fb0b8bb57e32c638cfc4ed72f94fc98c3 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Fri Apr 14 11:23:36 2017 -0700 |
| committer | Steven Moreland <smoreland@google.com> | Wed Apr 19 10:39:54 2017 -0700 |
| tree | 742caf9479a2d5c2ab1e5da24eb1d17141e8781f | |
| parent | 48908fc9470c1f881f3f5493ac76ae74881242f1 [diff] |
libbase: fix build breakage Two changes were merged at the same time that conflicted. Test: builds (cherry picked from commit 72b9d28423fb79eebdd4d74593ca03e1cbc7d75f) Merged-In: Ia6c730804cd5a3b2655e6d69b8e4f346d198dabb Change-Id: Ia6c730804cd5a3b2655e6d69b8e4f346d198dabb
diff --git a/Android.bp b/Android.bp index c1c0bf8..afb7dd3 100644 --- a/Android.bp +++ b/Android.bp
@@ -59,7 +59,6 @@ cppflags: libbase_cppflags, shared_libs: ["liblog"], - header_libs: ["libutils_headers"], target: { android: { srcs: [