openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

am 28d74436: am fe593edd: Merge "Build only 64-bit odex for system server jars." 

* commit '28d74436e1b36ca5c5a5265bc1759fa7183fc09c':
  Build only 64-bit odex for system server jars.
This commit is contained in:
Ying Wang 2015-03-13 02:59:08 +00:00 committed by Android Git Automerger
parent 0694eabe4d 28d74436e1
commit fa8bcffa5a
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/dex_preopt_odex_install.mk
View File

@ -53,7 +53,14 @@ installed_odex := $(DEFAULT_DEX_PREOPT_INSTALLED_IMAGE)
installed_odex += $($(TARGET_2ND_ARCH_VAR_PREFIX)DEFAULT_DEX_PREOPT_INSTALLED_IMAGE) installed_odex += $($(TARGET_2ND_ARCH_VAR_PREFIX)DEFAULT_DEX_PREOPT_INSTALLED_IMAGE)
else # boot jar else # boot jar
ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES) ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES)
# For a Java library, we build odex for both 1st arch and 2nd arch, if we have one. # For a Java library, by default we build odex for both 1st arch and 2nd arch.
# But it can be overridden with "LOCAL_MULTILIB := first".
ifneq (,$(filter $(PRODUCT_SYSTEM_SERVER_JARS),$(LOCAL_MODULE)))
# For system server jars, we build for only "first".
my_module_multilib := first
else
my_module_multilib := $(LOCAL_MULTILIB)
endif
# ################################################# # #################################################
# Odex for the 1st arch # Odex for the 1st arch
my_2nd_arch_prefix := my_2nd_arch_prefix :=
@ -61,8 +68,10 @@ include $(BUILD_SYSTEM)/setup_one_odex.mk
# ################################################# # #################################################
# Odex for the 2nd arch # Odex for the 2nd arch
ifdef TARGET_2ND_ARCH ifdef TARGET_2ND_ARCH
ifneq (first,$(my_module_multilib))
my_2nd_arch_prefix := $(TARGET_2ND_ARCH_VAR_PREFIX) my_2nd_arch_prefix := $(TARGET_2ND_ARCH_VAR_PREFIX)
include $(BUILD_SYSTEM)/setup_one_odex.mk include $(BUILD_SYSTEM)/setup_one_odex.mk
endif # my_module_multilib is not first.
endif # TARGET_2ND_ARCH endif # TARGET_2ND_ARCH
# ################################################# # #################################################
else # must be APPS else # must be APPS