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

resolved conflicts for merge of 084209e2 to klp-modular-dev-plus-aosp

Browse source 
Change-Id: Ibf80470cfcaf553335d07c6fb220f7e9ec81ed87
This commit is contained in:
Narayan Kamath 2014-01-31 12:23:28 +00:00
commit c1375f6991
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CleanSpec.mk
View file

@ -211,6 +211,10 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
# 4.4.2 # 4.4.2
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
# "L" and beyond.
# Make libart the default runtime
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
# ************************************************ # ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************ # ************************************************

4
core/combo/HOST_windows-x86.mk
View file

@ -40,6 +40,10 @@ endif # BUILD_HOST_64bit
endif # USE_MINGW endif # USE_MINGW
endif # Linux endif # Linux
# Workaround differences in inttypes.h between host and target.
# See bug 12708004.
HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS
HOST_CC := $(TOOLS_PREFIX)gcc$(TOOLS_EXE_SUFFIX) HOST_CC := $(TOOLS_PREFIX)gcc$(TOOLS_EXE_SUFFIX)
HOST_CXX := $(TOOLS_PREFIX)g++$(TOOLS_EXE_SUFFIX) HOST_CXX := $(TOOLS_PREFIX)g++$(TOOLS_EXE_SUFFIX)
HOST_AR := $(TOOLS_PREFIX)ar$(TOOLS_EXE_SUFFIX) HOST_AR := $(TOOLS_PREFIX)ar$(TOOLS_EXE_SUFFIX)

2
core/product_config.mk
View file

@ -164,11 +164,13 @@ endif # unbundled_goals
# Default to building dalvikvm on hosts that support it... # Default to building dalvikvm on hosts that support it...
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
ifeq ($(BUILD_HOST_64bit),)
# ... or if the if the option is already set # ... or if the if the option is already set
ifeq ($(WITH_HOST_DALVIK),) ifeq ($(WITH_HOST_DALVIK),)
WITH_HOST_DALVIK := true WITH_HOST_DALVIK := true
endif endif
endif endif
endif
# --------------------------------------------------------------- # ---------------------------------------------------------------
# Include the product definitions. # Include the product definitions.