Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit 'f781b4ef4bd840b7cee83fafdf2e31e709068bd3'

* commit 'f781b4ef4bd840b7cee83fafdf2e31e709068bd3':
  Fix build on some linux machines
This commit is contained in:
Jean-Baptiste Queru
2010-08-11 10:07:56 -07:00
committed by Android Git Automerger
parent df0e9b1b31 f781b4ef4b
commit f252b3501e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/aapt/Android.mk
View File

@@ -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),

2
tools/localize/Android.mk
View File

@@ -34,7 +34,7 @@ LOCAL_STATIC_LIBRARIES := \
libcutils
ifeq ($(HOST_OS),linux)
LOCAL_LDLIBS += -lrt
LOCAL_LDLIBS += -lrt -lpthread
endif