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

Commit 77a78fca authored by Ulya Trafimovich's avatar Ulya Trafimovich
Browse files

Refactor library path representation in dexpreopt. 

This is a preliminary CL before fixing on-device paths to DEX jars.
It groups together the inormation about on-host build paths and
on-device install paths to library DEX jars.

This CL changes the structure of module dexpreopt.config files
generated by the build system. Aside of that, no functional changes.

Test: lunch aosp_cf_x86_phone-userdebug && m
Change-Id: I8e92829885f26522aa2b936e77e91ce91593b27c
parent 4c5ed87f

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))