diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-05-19 17:04:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-19 17:04:54 +0000 |
| commit | 8d422a3a0b61e02f4e65f9a762fd2f55e7dc8862 (patch) | |
| tree | 5018529aac7cae890da3770fe8f40889e21faf30 /core/prebuilt_internal.mk | |
| parent | d9af5a545855f5919c6a8655c2011c9a9c0b30c7 (diff) | |
| parent | 8074ff4d0f962a933586b9809d1f1bdffe1fe5ed (diff) | |
| download | build-8d422a3a0b61e02f4e65f9a762fd2f55e7dc8862.zip build-8d422a3a0b61e02f4e65f9a762fd2f55e7dc8862.tar.gz build-8d422a3a0b61e02f4e65f9a762fd2f55e7dc8862.tar.bz2 | |
am 8074ff4d: am a8355eca: am 64f3a191: Merge "Multilib support for odex"
* commit '8074ff4d0f962a933586b9809d1f1bdffe1fe5ed':
Multilib support for odex
Diffstat (limited to 'core/prebuilt_internal.mk')
| -rw-r--r-- | core/prebuilt_internal.mk | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index 9507121..184ebb0 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -160,13 +160,7 @@ LOCAL_DEX_PREOPT := false include $(BUILD_SYSTEM)/dex_preopt_odex_install.mk ####################################### ifdef LOCAL_DEX_PREOPT -$(built_module): PRIVATE_DEX_PREOPT_IMAGE := $(LOCAL_DEX_PREOPT_IMAGE) -$(built_module): PRIVATE_DEX_LOCATION := $(patsubst $(PRODUCT_OUT)%,%,$(LOCAL_INSTALLED_MODULE)) $(built_module): PRIVATE_BUILT_ODEX := $(built_odex) -# Make sure the boot jars get dexpreopt-ed first -$(built_module) : $(DEXPREOPT_ONE_FILE_DEPENDENCY_BUILT_BOOT_PREOPT) -$(built_module) : $(DEXPREOPT_ONE_FILE_DEPENDENCY_TOOLS) -(built_module) : $(LOCAL_DEX_PREOPT_IMAGE) # built_odex is byproduct of LOCAL_BUILT_MODULE without its own build recipe. $(built_odex) : $(LOCAL_BUILT_MODULE) endif # LOCAL_DEX_PREOPT @@ -180,7 +174,7 @@ ifneq ($(LOCAL_CERTIFICATE),PRESIGNED) $(sign-package) endif ifdef LOCAL_DEX_PREOPT - $(call dexpreopt-one-file,$(PRIVATE_DEX_PREOPT_IMAGE),$@,$(PRIVATE_DEX_LOCATION),$(PRIVATE_BUILT_ODEX)) + $(call dexpreopt-one-file,$@,$(PRIVATE_BUILT_ODEX)) endif $(align-package) |