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

Commit 59073b15 authored Aug 25, 2010 by Brian Carlstrom Committed by Android (Google) Code Review Aug 25, 2010

Merge "Fix linux 64 build" into gingerbread

parents 231a0005 74b58fc5

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