StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I5bbd2294 into eclair-mr2

Browse Source 
* changes:
  For Ying Wang:
This commit is contained in:
Android (Google) Code Review
2009-10-07 21:09:17 -04:00
parent 160028f832 5bbd2294e9
commit 2bd9027d0a
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/combo/darwin-x86.mk
View File

@@ -14,6 +14,7 @@ $(combo_target)JNILIB_SUFFIX := .jnilib
$(combo_target)GLOBAL_CFLAGS += \ $(combo_target)GLOBAL_CFLAGS += \
-include $(call select-android-config-h,darwin-x86) -include $(call select-android-config-h,darwin-x86)
$(combo_target)RUN_RANLIB_AFTER_COPYING := true $(combo_target)RUN_RANLIB_AFTER_COPYING := true
$(combo_target)GLOBAL_ARFLAGS := cqs
ifeq ($(combo_target),TARGET_) ifeq ($(combo_target),TARGET_)
$(combo_target)CUSTOM_LD_COMMAND := true $(combo_target)CUSTOM_LD_COMMAND := true

2
core/combo/select.mk
View File

@@ -40,7 +40,7 @@ $(combo_target)HAVE_KERNEL_MODULES := 0
$(combo_target)GLOBAL_CFLAGS := -fno-exceptions -Wno-multichar $(combo_target)GLOBAL_CFLAGS := -fno-exceptions -Wno-multichar
$(combo_target)RELEASE_CFLAGS := -O2 -g -fno-strict-aliasing $(combo_target)RELEASE_CFLAGS := -O2 -g -fno-strict-aliasing
$(combo_target)GLOBAL_LDFLAGS := $(combo_target)GLOBAL_LDFLAGS :=
$(combo_target)GLOBAL_ARFLAGS := crs $(combo_target)GLOBAL_ARFLAGS := crsP
$(combo_target)EXECUTABLE_SUFFIX := $(combo_target)EXECUTABLE_SUFFIX :=
$(combo_target)SHLIB_SUFFIX := .so $(combo_target)SHLIB_SUFFIX := .so

4
core/definitions.mk
View File

@@ -931,7 +931,7 @@ define transform-o-to-static-lib
@rm -f $@ @rm -f $@
$(extract-and-include-whole-static-libs) $(extract-and-include-whole-static-libs)
@echo "target StaticLib: $(PRIVATE_MODULE) ($@)" @echo "target StaticLib: $(PRIVATE_MODULE) ($@)"
$(hide) $(TARGET_AR) $(TARGET_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@ $^ $(hide) echo $^ | xargs $(TARGET_AR) $(TARGET_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@
endef endef
########################################################### ###########################################################
@@ -944,7 +944,7 @@ define transform-host-o-to-static-lib
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@echo "host StaticLib: $(PRIVATE_MODULE) ($@)" @echo "host StaticLib: $(PRIVATE_MODULE) ($@)"
@rm -f $@ @rm -f $@
$(HOST_AR) $(HOST_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@ $^ echo $^ | xargs $(HOST_AR) $(HOST_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@
endef endef