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

Commit f252b350 authored Aug 11, 2010 by Jean-Baptiste Queru Committed by Android Git Automerger Aug 11, 2010

am f781b4ef: am e37ab632: Merge "Fix build on some linux machines"

Merge commit 'f781b4ef'

* commit 'f781b4ef':
  Fix build on some linux machines

parents df0e9b1b f781b4ef

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