db48da7844
Build odex for both arch in multilib build if an app has LOCAL_MULTILIB := both. Refactored the common setup code to a separate file setup_one_odex.mk. Bug: 17409149 Bug: 14694978 Change-Id: I74c9426cd74fe0b0cb4811368f740a88ac2ae022
39 lines
1.9 KiB
Makefile
39 lines
1.9 KiB
Makefile
#
|
|
# Copyright (C) 2014 The Android Open Source Project
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
|
|
# Set up variables and dependency for one odex file
|
|
# Input variables: my_2nd_arch_prefix
|
|
# Output(modified) variables: built_odex, installed_odex, built_installed_odex
|
|
|
|
my_built_odex := $(call get-odex-file-path,$($(my_2nd_arch_prefix)DEX2OAT_TARGET_ARCH),$(LOCAL_BUILT_MODULE))
|
|
ifdef LOCAL_DEX_PREOPT_IMAGE_LOCATION
|
|
my_dex_preopt_image_location := $(LOCAL_DEX_PREOPT_IMAGE_LOCATION)
|
|
else
|
|
my_dex_preopt_image_location := $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_LOCATION)
|
|
endif
|
|
my_dex_preopt_image_filename := $(call get-image-file-path,$($(my_2nd_arch_prefix)DEX2OAT_TARGET_ARCH),$(my_dex_preopt_image_location))
|
|
$(my_built_odex): PRIVATE_2ND_ARCH_VAR_PREFIX := $(my_2nd_arch_prefix)
|
|
$(my_built_odex): PRIVATE_DEX_LOCATION := $(patsubst $(PRODUCT_OUT)%,%,$(LOCAL_INSTALLED_MODULE))
|
|
$(my_built_odex): PRIVATE_DEX_PREOPT_IMAGE_LOCATION := $(my_dex_preopt_image_location)
|
|
$(my_built_odex) : $($(my_2nd_arch_prefix)DEXPREOPT_ONE_FILE_DEPENDENCY_BUILT_BOOT_PREOPT) \
|
|
$(DEXPREOPT_ONE_FILE_DEPENDENCY_TOOLS) \
|
|
$(my_dex_preopt_image_filename)
|
|
|
|
my_installed_odex := $(call get-odex-file-path,$($(my_2nd_arch_prefix)DEX2OAT_TARGET_ARCH),$(LOCAL_INSTALLED_MODULE))
|
|
|
|
built_odex += $(my_built_odex)
|
|
installed_odex += $(my_installed_odex)
|
|
built_installed_odex += $(my_built_odex):$(my_installed_odex)
|