commit c2144bb0c48afb6d940516f97b18576761255fef
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 19 05:08:26 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 19 05:08:26 2019 +0000
tree 681f3ce6ba832c3b0d8bb6dc73dd579a88c27b05
parent b6520ddcf1582550f464b4869940e98c452adb22
parent 3ecb9c4fdd5c78feede432fe5203c1dd94f8ec42

Merge "Add a dependency on boot jars $(LOCAL_BUILT_MODULE)"

core/soong_java_prebuilt.mk

diff --git a/core/soong_java_prebuilt.mk b/core/soong_java_prebuilt.mk
index 6214ac6..9692a99 100644
--- a/core/soong_java_prebuilt.mk
+++ b/core/soong_java_prebuilt.mk
@@ -94,6 +94,8 @@
         ALL_MODULES.$(my_register_name).INSTALLED += $(installed_odex)
         # Make sure to install the .odex and .vdex when you run "make <module_name>"
        $(my_all_targets): $(installed_odex)
+       # Copy $(LOCAL_BUILT_MODULE) and its dependencies when installing boot.art
+       $(DEFAULT_DEX_PREOPT_INSTALLED_IMAGE): $(LOCAL_BUILT_MODULE)
       endif
     endif # is_boot_jar