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

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

Merge "Fix on-device paths to used libraries in dexpreopt." am: cd33e764 

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

Change-Id: I8f420aa79eb93b53e1e97e6b89c49b341cdbad13
parents 9d7c4c0a cd33e764

core/definitions.mk

+8 −0
Original line number Original line Diff line number Diff line
@@ -538,6 +538,14 @@ $(strip \ 
)

)

endef

endef





###########################################################

## Convert install path to on-device path.

###########################################################

# $(1): install path

define install-path-to-on-device-path

$(patsubst $(PRODUCT_OUT)%,%,$(1))

endef



###########################################################

###########################################################

## The intermediates directory.  Where object files go for

## The intermediates directory.  Where object files go for

## a given target.  We could technically get away without

## a given target.  We could technically get away without

core/dex_preopt_odex_install.mk

+3 −2
Original line number Original line Diff line number Diff line
@@ -235,8 +235,9 @@ ifdef LOCAL_DEX_PREOPT 
  $(call add_json_map,  LibraryPaths)

  $(call add_json_map,  LibraryPaths)

  $(foreach lib,$(my_dexpreopt_libs),\

  $(foreach lib,$(my_dexpreopt_libs),\

    $(call add_json_map, $(lib)) \

    $(call add_json_map, $(lib)) \

    $(eval file := $(filter %/$(lib).jar, $(call module-installed-files,$(lib)))) \

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

    $(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 add_json_str, Device, $(call install-path-to-on-device-path,$(file))) \

    $(call end_json_map))

    $(call end_json_map))

  $(call end_json_map)

  $(call end_json_map)

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

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