Commit e131f31d authored Apr 14, 2017 by Steven Moreland

libbase: fix build breakage

Two changes were merged at the same time that conflicted.

Test: builds
(cherry picked from commit 72b9d284)
Merged-In: Ia6c730804cd5a3b2655e6d69b8e4f346d198dabb
Change-Id: Ia6c730804cd5a3b2655e6d69b8e4f346d198dabb

parent 9990de1f

base/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -59,7 +59,6 @@ cc_library {

		cppflags: libbase_cppflags,
		shared_libs: ["liblog"],
		header_libs: ["libutils_headers"],
		target: {
		android: {
		srcs: [