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

Commit 196f1905 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Fix shared library install dependencies outside of /system" am: 0b3f97b0 am: f9fc0ea6 

am: 7c4ced53

Change-Id: Ibc3c3fca687f7541d779d390e3cbc6123f88e149
parents 5a63fe68 7c4ced53

core/main.mk

+6 −5
Original line number Diff line number Diff line
@@ -665,11 +665,11 @@ $(foreach m,$(ALL_MODULES), \ 
  $(if $(r), \

    $(eval r := $(call module-installed-files,$(r))) \

    $(eval t_m := $(filter $(TARGET_OUT_ROOT)/%, $(ALL_MODULES.$(m).INSTALLED))) \

    $(eval h_m := $(filter $(HOST_OUT_ROOT)/%, $(ALL_MODULES.$(m).INSTALLED))) \

    $(eval hc_m := $(filter $(HOST_CROSS_OUT_ROOT)/%, $(ALL_MODULES.$(m).INSTALLED))) \

    $(eval h_m := $(filter $(HOST_OUT)/%, $(ALL_MODULES.$(m).INSTALLED))) \

    $(eval hc_m := $(filter $(HOST_CROSS_OUT)/%, $(ALL_MODULES.$(m).INSTALLED))) \

    $(eval t_r := $(filter $(TARGET_OUT_ROOT)/%, $(r))) \

    $(eval h_r := $(filter $(HOST_OUT_ROOT)/%, $(r))) \

    $(eval hc_r := $(filter $(HOST_CROSS_OUT_ROOT)/%, $(r))) \

    $(eval h_r := $(filter $(HOST_OUT)/%, $(r))) \

    $(eval hc_r := $(filter $(HOST_CROSS_OUT)/%, $(r))) \

    $(eval t_m := $(filter-out $(t_r), $(t_m))) \

    $(eval h_m := $(filter-out $(h_r), $(h_m))) \

    $(eval hc_m := $(filter-out $(hc_r), $(hc_m))) \
@@ -697,9 +697,10 @@ $(foreach m,$($(if $(2),$($(1)2ND_ARCH_VAR_PREFIX))$(1)DEPENDENCIES_ON_SHARED_LI 
  $(eval p := $(subst :,$(space),$(m)))\

  $(eval mod := $(firstword $(p)))\

  $(eval deps := $(subst $(comma),$(space),$(lastword $(p))))\

  $(eval root := $(1)OUT$(if $(call streq,$(1),TARGET_),_ROOT))\

  $(if $(2),$(eval deps := $(addsuffix $($(1)2ND_ARCH_MODULE_SUFFIX),$(deps))))\

  $(if $(3),$(eval deps := $(addprefix host_cross_,$(deps))))\

  $(eval r := $(filter $($(1)OUT)/%,$(call module-installed-files,\

  $(eval r := $(filter $($(root))/%,$(call module-installed-files,\

    $(deps))))\

  $(eval $(call add-required-deps,$(word 2,$(p)),$(r)))\

  $(eval ALL_MODULES.$(mod).REQUIRED += $(deps)))