commit 3369591b99778eb0628e6008c2684578d4e62c0c
author Martin Stjernholm <mast@google.com> Tue Jan 07 00:04:41 2020 +0000
committer Martin Stjernholm <mast@google.com> Tue Jan 07 12:37:05 2020 +0000
tree 2ccf57c566323e99c8583cf2742a1737fe8b1e5a
parent 455bb387134bda286799ed727d4b33762ef1d5b1

Remove DEX2OAT_DEPENDENCY which is the same as DEX2OAT.

Small cleanup to simplify the move of it into Soong.

Test: presubmits
Bug: 145934348
Change-Id: Ib60642168c8b27de9817539381177b8ee0c49f7c

build/Android.oat.mk

diff --git a/build/Android.oat.mk b/build/Android.oat.mk
index 7c3e791..c6fe400 100644
--- a/build/Android.oat.mk
+++ b/build/Android.oat.mk
@@ -44,11 +44,10 @@
   core_image_name :=
   core_oat_name :=
   core_infix :=
-  core_dex2oat_dependency := $(DEX2OAT_DEPENDENCY)
+  core_dex2oat_dependency := $(DEX2OAT)
 
   ifeq ($(1),optimizing)
     core_compile_options += --compiler-backend=Optimizing
-    core_dex2oat_dependency := $(DEX2OAT)
   endif
   ifeq ($(1),interpreter)
     core_compile_options += --compiler-filter=quicken
@@ -157,13 +156,10 @@
   core_image_name :=
   core_oat_name :=
   core_infix :=
-  core_dex2oat_dependency := $(DEX2OAT_DEPENDENCY)
+  core_dex2oat_dependency := $(DEX2OAT)
 
   ifeq ($(1),optimizing)
     core_compile_options += --compiler-backend=Optimizing
-    # With the optimizing compiler, we want to rerun dex2oat whenever there is
-    # a dex2oat change to catch regressions early.
-    core_dex2oat_dependency := $(DEX2OAT)
   endif
   ifeq ($(1),interpreter)
     core_compile_options += --compiler-filter=quicken