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

Commit e37ab632 authored Aug 11, 2010 by Jean-Baptiste Queru Committed by Android Code Review Aug 11, 2010

Merge "Fix build on some linux machines"

parents c4c4c98c b7ffaf6a

tools/aapt/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ LOCAL_STATIC_LIBRARIES := \
		libpng

		ifeq ($(HOST_OS),linux)
		LOCAL_LDLIBS += -lrt
		LOCAL_LDLIBS += -lrt -lpthread
		endif

		# Statically link libz for MinGW (Win SDK under Linux),

tools/localize/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ LOCAL_STATIC_LIBRARIES := \
		libcutils

		ifeq ($(HOST_OS),linux)
		LOCAL_LDLIBS += -lrt
		LOCAL_LDLIBS += -lrt -lpthread
		endif