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

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

Merge "Add LOCAL_PROVIDES_USES_LIBRARY and use it in module dexpreopt config." am: bcabefa6 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf7e360fb726cccc1a19afaa3103d5f20f682c17
parents df770772 bcabefa6

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ LOCAL_PROTOC_FLAGS:= 
# lite(default),micro,nano,stream,full,nanopb-c,nanopb-c-enable_malloc,nanopb-c-16bit,nanopb-c-enable_malloc-16bit,nanopb-c-32bit,nanopb-c-enable_malloc-32bit

LOCAL_PROTOC_OPTIMIZE_TYPE:=

LOCAL_PROTO_JAVA_OUTPUT_PARAMS:=

LOCAL_PROVIDES_USES_LIBRARY:=

LOCAL_R8_FLAG_FILES:=

LOCAL_RECORDED_MODULE_TYPE:=

LOCAL_RENDERSCRIPT_CC:=

core/dex_preopt_odex_install.mk

+1 −0
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ ifdef LOCAL_DEX_PREOPT 
  $(call add_json_str,  ProfileClassListing,            $(if $(my_process_profile),$(LOCAL_DEX_PREOPT_PROFILE)))

  $(call add_json_bool, ProfileIsTextListing,           $(my_profile_is_text_listing))

  $(call add_json_bool, EnforceUsesLibraries,           $(LOCAL_ENFORCE_USES_LIBRARIES))

  $(call add_json_str,  ProvidesUsesLibrary,            $(firstword $(LOCAL_PROVIDES_USES_LIBRARY) $(LOCAL_MODULE)))

  $(call add_json_map,  ClassLoaderContexts)

  $(call add_json_class_loader_context, any, $(my_dexpreopt_libs))

  $(call add_json_class_loader_context,  28, $(my_dexpreopt_libs_compat_28))