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

Merge "Fix linux 64 build" into gingerbread

Browse Source
This commit is contained in:
Brian Carlstrom
2010-08-25 09:28:00 -07:00
committed by Android (Google) Code Review
parent 231a000565 74b58fc58b
commit 59073b155a
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