diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2014-05-13 13:22:32 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2014-05-13 13:22:32 +0530 |
| commit | 73cdf07d18e3da2920dc49993a855f0ef02494bb (patch) | |
| tree | 9cb63c07cfa6ab36d0ceae90836b65e7fc19688b | |
| parent | f08cac195fcaae78632bbf06192902adb3dbd6c1 (diff) | |
| parent | fb1f38ecbacfb5dc2cc4f3f83eb814ac2aa090ca (diff) | |
| download | build-73cdf07d18e3da2920dc49993a855f0ef02494bb.tar.gz | |
Merge master
* aosp/master:
Place ISA in ART boot image name.
executable_prefer_symlink: add makefile for creating symlink to prefer version
Define __USE_MINGW_ANSI_STDIO for windows build
| -rw-r--r-- | core/combo/HOST_windows-x86.mk | 2 | ||||
| -rw-r--r-- | core/dex_preopt_libart.mk | 4 | ||||
| -rw-r--r-- | core/executable_prefer_symlink.mk | 25 |
3 files changed, 28 insertions, 3 deletions
diff --git a/core/combo/HOST_windows-x86.mk b/core/combo/HOST_windows-x86.mk index 170971114f..cd047a1283 100644 --- a/core/combo/HOST_windows-x86.mk +++ b/core/combo/HOST_windows-x86.mk @@ -42,7 +42,7 @@ endif # Linux # Workaround differences in inttypes.h between host and target. # See bug 12708004. -HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS +HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS -D__USE_MINGW_ANSI_STDIO HOST_CC := $(TOOLS_PREFIX)gcc$(TOOLS_EXE_SUFFIX) HOST_CXX := $(TOOLS_PREFIX)g++$(TOOLS_EXE_SUFFIX) diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk index 73e8494f9e..7f3285ce16 100644 --- a/core/dex_preopt_libart.mk +++ b/core/dex_preopt_libart.mk @@ -23,9 +23,9 @@ DEX2OATD_DEPENDENCY += $(LIBARTD_COMPILER) PRELOADED_CLASSES := frameworks/base/preloaded-classes -LIBART_BOOT_IMAGE := /$(DEXPREOPT_BOOT_JAR_DIR)/boot.art +LIBART_BOOT_IMAGE := /$(DEXPREOPT_BOOT_JAR_DIR)/boot-$(DEX2OAT_TARGET_ARCH).art -DEFAULT_DEX_PREOPT_BUILT_IMAGE := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/boot.art +DEFAULT_DEX_PREOPT_BUILT_IMAGE := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/boot-$(DEX2OAT_TARGET_ARCH).art DEFAULT_DEX_PREOPT_INSTALLED_IMAGE := ifneq ($(PRODUCT_DEX_PREOPT_IMAGE_IN_DATA),true) diff --git a/core/executable_prefer_symlink.mk b/core/executable_prefer_symlink.mk new file mode 100644 index 0000000000..c6abed4172 --- /dev/null +++ b/core/executable_prefer_symlink.mk @@ -0,0 +1,25 @@ +# include this makefile to create the LOCAL_MODULE symlink to the primary version binary. +# but this requires the primary version name specified via LOCAL_MODULE_STEM_32 or LOCAL_MODULE_STEM_64, +# and different with the LOCAL_MODULE value +# +# Note: now only limited to the binaries that will be installed under system/bin directory + +my_symlink := $(addprefix $(TARGET_OUT)/bin/, $(LOCAL_MODULE)) +# create link to the one used for prefer version +ifneq ($(TARGET_PREFER_32_BIT_APPS),true) + $(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_64) +else + $(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_32) +endif + +$(my_symlink): $(LOCAL_INSTALLED_MODULE) $(LOCAL_MODULE_MAKEFILE) + @echo "Symlink: $@ -> $(PRIVATE_SRC_BINARY_NAME)" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf $(PRIVATE_SRC_BINARY_NAME) $@ + +# We need this so that the installed files could be picked up based on the +# local module name +ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(my_symlink) + +my_symlink := |