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

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

Browse Source 
Merge commit 'e37ab63221af94d69437741a3645fc0e14a680bc' into gingerbread-plus-aosp

* commit 'e37ab63221af94d69437741a3645fc0e14a680bc':
  Fix build on some linux machines
This commit is contained in:
Jean-Baptiste Queru
2010-08-11 10:04:31 -07:00
committed by Android Git Automerger
parent 371dbcba11 e37ab63221
commit f781b4ef4b
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 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),

2
tools/localize/Android.mk
View File

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