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

Commit f781b4ef authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

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

Merge commit 'e37ab632' into gingerbread-plus-aosp

* commit 'e37ab632':
  Fix build on some linux machines
parents 371dbcba e37ab632

tools/aapt/Android.mk

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

	libpng





ifeq ($(HOST_OS),linux)

ifeq ($(HOST_OS),linux)

LOCAL_LDLIBS += -lrt

LOCAL_LDLIBS += -lrt -lpthread

endif

endif





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

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

tools/localize/Android.mk

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

	libcutils

    

    

ifeq ($(HOST_OS),linux)

ifeq ($(HOST_OS),linux)

LOCAL_LDLIBS += -lrt

LOCAL_LDLIBS += -lrt -lpthread

endif

endif