Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 632d1543 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Don't install boot.art when WITH_DEXPREOPT is false"

parents 632ee3de 19fbc1b9

core/soong_java_prebuilt.mk

+10 −8
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ ifdef LOCAL_SOONG_DEX_JAR 
        $(eval $(call hiddenapi-generate-csv,$(full_classes_jar),$(hiddenapi_flags_csv),$(hiddenapi_metadata_csv)))

        $(eval $(call hiddenapi-copy-soong-jar,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))



        ifeq (true,$(WITH_DEXPREOPT))

          # For libart, the boot jars' odex files are replaced by $(DEFAULT_DEX_PREOPT_INSTALLED_IMAGE).

          # We use this installed_odex trick to get boot.art installed.

          installed_odex := $(DEFAULT_DEX_PREOPT_INSTALLED_IMAGE)
@@ -91,6 +92,7 @@ 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)

        endif

      else # !is_boot_jar

        $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))

      endif # is_boot_jar