Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8569a3b3 authored Sep 11, 2015 by Dan Albert Committed by Android Git Automerger Sep 11, 2015

am 933f4fd4: Merge "Ensure that libbase and liblog can be built for Windows."

* commit '933f4fd4':
  Ensure that libbase and liblog can be built for Windows.

parents 31254577 933f4fd4

base/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,7 @@ LOCAL_SHARED_LIBRARIES := liblog
		LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
		LOCAL_STATIC_LIBRARIES := libcutils
		LOCAL_MULTILIB := both
		LOCAL_MODULE_HOST_OS := darwin linux windows
		include $(BUILD_HOST_SHARED_LIBRARY)

		# Tests

liblog/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := liblog
		LOCAL_LDLIBS_linux := -lrt
		LOCAL_MULTILIB := both
		LOCAL_CXX_STL := none
		LOCAL_MODULE_HOST_OS := darwin linux windows
		include $(BUILD_HOST_SHARED_LIBRARY)