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

Commit 6a7f7b26 authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Automerger Merge Worker
Browse files

Merge "Refactor library path representation in dexpreopt." am: 660edfdc 

Original change: https://android-review.googlesource.com/c/platform/build/+/1321926

Change-Id: Iba2da276e7c88b6ed95db93825c233bebb2458c4
parents b3e68361 660edfdc

core/dex_preopt_odex_install.mk

+4 −1
Original line number Diff line number Diff line
@@ -234,7 +234,10 @@ ifdef LOCAL_DEX_PREOPT 
  $(call add_json_list, UsesLibraries,                  $(LOCAL_USES_LIBRARIES))

  $(call add_json_map,  LibraryPaths)

  $(foreach lib,$(my_dexpreopt_libs),\

    $(call add_json_str, $(lib), $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/javalib.jar))

    $(call add_json_map, $(lib)) \

    $(call add_json_str, Host, $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/javalib.jar) \

    $(call add_json_str, Device, /system/framework/$(lib).jar) \

    $(call end_json_map))

  $(call end_json_map)

  $(call add_json_list, Archs,                          $(my_dexpreopt_archs))

  $(call add_json_list, DexPreoptImages,                $(my_dexpreopt_images))