LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 633b5ed5: Merge change 8178 into donut

Browse Source 
Merge commit '633b5ed51b9877f36b8248d6d0fc96870768e8b5'

* commit '633b5ed51b9877f36b8248d6d0fc96870768e8b5':
  Ensure LOCAL_LDLIBS is cleared by the $(CLEAR_VARS) script
This commit is contained in:
Android (Google) Code Review
2009-07-23 16:25:10 -07:00
committed by Android Git Automerger
parent 0d375f5b94 633b5ed51b
commit 2481ea1c8f
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ndk/build/core/clear-vars.mk
View File

@@ -24,6 +24,7 @@ NDK_LOCAL_VARS := \
LOCAL_CXXFLAGS \ LOCAL_CXXFLAGS \
LOCAL_CPPFLAGS \ LOCAL_CPPFLAGS \
LOCAL_LDFLAGS \ LOCAL_LDFLAGS \
LOCAL_LDLIBS \
LOCAL_ARFLAGS \ LOCAL_ARFLAGS \
LOCAL_CPP_EXTENSION \ LOCAL_CPP_EXTENSION \
LOCAL_STATIC_LIBRARIES \ LOCAL_STATIC_LIBRARIES \

3
ndk/docs/CHANGES.TXT
View File

@@ -17,7 +17,8 @@ current version
LOCAL_LDLIBS := -lz LOCAL_LDLIBS := -lz
Actually work correctly, instead of having the linker complaining that it Actually work correctly, instead of having the linker complaining that it
could not find the corresponding libz.so library. could not find the corresponding libz.so library. Also clear LOCAL_LDLIBS
in $(CLEAR_VARS) script.
- Generate thumb binaries by default. - Generate thumb binaries by default.