diff options
| author | Ying Wang <wangying@google.com> | 2015-03-11 20:43:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-11 20:43:32 +0000 |
| commit | fe593edd5377f5046ef07d2efa53670451bd13a4 (patch) | |
| tree | b487a1a8ff52d79e7507c6001d336d9b526457e5 | |
| parent | a2ad467f7a82511901625aa8dd8253c19df87a1c (diff) | |
| parent | c7ca6173ce968c821c87df9849ffa1c4e0aabd78 (diff) | |
| download | build-fe593edd5377f5046ef07d2efa53670451bd13a4.zip build-fe593edd5377f5046ef07d2efa53670451bd13a4.tar.gz build-fe593edd5377f5046ef07d2efa53670451bd13a4.tar.bz2 | |
Merge "Build only 64-bit odex for system server jars."
| -rw-r--r-- | core/dex_preopt_odex_install.mk | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index aef5cd1..73c8146 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -53,7 +53,14 @@ installed_odex := $(DEFAULT_DEX_PREOPT_INSTALLED_IMAGE) installed_odex += $($(TARGET_2ND_ARCH_VAR_PREFIX)DEFAULT_DEX_PREOPT_INSTALLED_IMAGE) else # boot jar 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 my_2nd_arch_prefix := @@ -61,8 +68,10 @@ include $(BUILD_SYSTEM)/setup_one_odex.mk # ################################################# # Odex for the 2nd arch ifdef TARGET_2ND_ARCH +ifneq (first,$(my_module_multilib)) my_2nd_arch_prefix := $(TARGET_2ND_ARCH_VAR_PREFIX) include $(BUILD_SYSTEM)/setup_one_odex.mk +endif # my_module_multilib is not first. endif # TARGET_2ND_ARCH # ################################################# else # must be APPS |