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

2019-03-19 05:08:26 +00:00 · 2019-03-19 05:08:26 +00:00 · c2144bb0c4
parent b6520ddcf1 3ecb9c4fdd
commit c2144bb0c4
1 changed files with 2 additions and 0 deletions
--- a/core/soong_java_prebuilt.mk
+++ b/core/soong_java_prebuilt.mk
@ -94,6 +94,8 @@ ifdef LOCAL_SOONG_DEX_JAR
        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