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

Commit 933f4fd4 authored Sep 11, 2015 by Dan Albert Committed by Gerrit Code Review Sep 11, 2015

Merge "Ensure that libbase and liblog can be built for Windows."

parents 059544f6 b0e4f082

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)