tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resolved conflicts for merge of 9f4d00b9 to master

Browse source 
Change-Id: I1818896ae714aa54ad980bfbf7648652369497e5
This commit is contained in:
Ying Wang 2012-06-05 15:44:21 -07:00
commit 130ae6adcb
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/combo/HOST_darwin-x86.mk
View file

@ -69,7 +69,7 @@ HOST_SHLIB_SUFFIX := .dylib
HOST_JNILIB_SUFFIX := .jnilib
HOST_GLOBAL_CFLAGS += \
-include $(call select-android-config-h,darwin-x86)
-include $(call select-android-config-h,darwin-x86)
ifneq ($(filter 10.7 10.7.% 10.8 10.8.%, $(build_mac_version)),)
HOST_RUN_RANLIB_AFTER_COPYING := false
else