diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-10-07 09:44:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-07 09:44:07 +0000 |
| commit | f3efdfc83082c1bcede663a0ace6ecf59150bb28 (patch) | |
| tree | c48efec5284bf2707d4993a9d05b9b67ae4901b8 /core/dex_preopt.mk | |
| parent | cb6992b4b4e4e562ddf4ef6194a438e0fcdc91ef (diff) | |
| parent | a6b9e887b98152f913f4e6d9f864da00bc1cc21e (diff) | |
| download | build-f3efdfc83082c1bcede663a0ace6ecf59150bb28.zip build-f3efdfc83082c1bcede663a0ace6ecf59150bb28.tar.gz build-f3efdfc83082c1bcede663a0ace6ecf59150bb28.tar.bz2 | |
am a6b9e887: am 4af753c1: Merge "Make which dex2oat version to use configurable."
* commit 'a6b9e887b98152f913f4e6d9f864da00bc1cc21e':
Make which dex2oat version to use configurable.
Diffstat (limited to 'core/dex_preopt.mk')
| -rw-r--r-- | core/dex_preopt.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index 8a19b66..72cb9f0 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -69,7 +69,7 @@ define dexpreopt-one-file $(call dex2oat-one-file,$(1),$(2)) endef -DEXPREOPT_ONE_FILE_DEPENDENCY_TOOLS := $(DEX2OATD_DEPENDENCY) +DEXPREOPT_ONE_FILE_DEPENDENCY_TOOLS := $(DEX2OAT_DEPENDENCY) DEXPREOPT_ONE_FILE_DEPENDENCY_BUILT_BOOT_PREOPT := $(DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) ifdef TARGET_2ND_ARCH $(TARGET_2ND_ARCH_VAR_PREFIX)DEXPREOPT_ONE_FILE_DEPENDENCY_BUILT_BOOT_PREOPT := $($(TARGET_2ND_ARCH_VAR_PREFIX)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) |