diff options
| author | Steven Moreland | 2017-04-14 13:23:36 -0500 |
|---|---|---|
| committer | Steven Moreland | 2017-04-19 12:39:54 -0500 |
| commit | e131f31db51100dfa27d201d86f3f2d92a89d0fc (patch) | |
| tree | 1aa01cb74233c7674737d9329aa8cf211c6456ce /base | |
| parent | 9990de1f643c9dc581e2977ae7222a21c39389b0 (diff) | |
| download | platform-system-core-e131f31db51100dfa27d201d86f3f2d92a89d0fc.tar.gz platform-system-core-e131f31db51100dfa27d201d86f3f2d92a89d0fc.tar.xz platform-system-core-e131f31db51100dfa27d201d86f3f2d92a89d0fc.zip | |
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
Diffstat (limited to 'base')
| -rw-r--r-- | base/Android.bp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/base/Android.bp b/base/Android.bp index c1c0bf83f..afb7dd363 100644 --- a/base/Android.bp +++ b/base/Android.bp | |||
| @@ -59,7 +59,6 @@ cc_library { | |||
| 59 | 59 | ||
| 60 | cppflags: libbase_cppflags, | 60 | cppflags: libbase_cppflags, |
| 61 | shared_libs: ["liblog"], | 61 | shared_libs: ["liblog"], |
| 62 | header_libs: ["libutils_headers"], | ||
| 63 | target: { | 62 | target: { |
| 64 | android: { | 63 | android: { |
| 65 | srcs: [ | 64 | srcs: [ |