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

Merge "Fix build."

Browse source
This commit is contained in:
Jean-Baptiste Queru 2012-07-27 10:05:22 -07:00 committed by android code review
commit 47e63bb4e4
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CleanSpec.mk
View file

@ -125,6 +125,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
# Now we switched to build against Mac OS X SDK 10.6 # Now we switched to build against Mac OS X SDK 10.6
$(call add-clean-step, rm -rf $(OUT_DIR)/host/darwin-x86/obj) $(call add-clean-step, rm -rf $(OUT_DIR)/host/darwin-x86/obj)
$(call add-clean-step, rm -f $(OUT_DIR)/versions_checked.mk)
# ************************************************ # ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************ # ************************************************

3
core/Makefile
View file

@ -1298,7 +1298,7 @@ dalvikfiles: $(INTERNAL_DALVIK_MODULES)
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# The emulator package # The emulator package
ifeq ($(BUILD_EMULATOR),true)
INTERNAL_EMULATOR_PACKAGE_FILES += \ INTERNAL_EMULATOR_PACKAGE_FILES += \
$(HOST_OUT_EXECUTABLES)/emulator$(HOST_EXECUTABLE_SUFFIX) \ $(HOST_OUT_EXECUTABLES)/emulator$(HOST_EXECUTABLE_SUFFIX) \
prebuilts/qemu-kernel/$(TARGET_ARCH)/kernel-qemu \ prebuilts/qemu-kernel/$(TARGET_ARCH)/kernel-qemu \
@ -1314,6 +1314,7 @@ $(INTERNAL_EMULATOR_PACKAGE_TARGET): $(INTERNAL_EMULATOR_PACKAGE_FILES)
@echo "Package: $@" @echo "Package: $@"
$(hide) zip -qj $@ $(INTERNAL_EMULATOR_PACKAGE_FILES) $(hide) zip -qj $@ $(INTERNAL_EMULATOR_PACKAGE_FILES)
endif
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Old PDK stuffs, retired # Old PDK stuffs, retired
# The pdk package (Platform Development Kit) # The pdk package (Platform Development Kit)

4
core/main.mk
View file

@ -187,7 +187,9 @@ MACOSX_SDK := /Developer/SDKs/MacOSX$(MSDK).sdk
ifeq ($(strip $(wildcard $(MACOSX_SDK))),) ifeq ($(strip $(wildcard $(MACOSX_SDK))),)
BUILD_EMULATOR := false BUILD_EMULATOR := false
endif endif
endif else # HOST_OS is not darwin
BUILD_EMULATOR := true
endif # HOST_OS is darwin
$(shell echo 'VERSIONS_CHECKED := $(VERSION_CHECK_SEQUENCE_NUMBER)' \ $(shell echo 'VERSIONS_CHECKED := $(VERSION_CHECK_SEQUENCE_NUMBER)' \
> $(OUT_DIR)/versions_checked.mk) > $(OUT_DIR)/versions_checked.mk)