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

Commit b2a5c7b3 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Fix init rc installation in vendor when LOCAL_MODULE_PATH is set 

The init.rc path selection uses the same partition_tag detection to
select an installation partition. So make sure that we always set
partition_tag even if we've been given an explicit module path.

Bug: 35314904
Test: set proprietary: true to Soong module with an init rc, verify
      that was the only change to build-aosp_arm64.ninja
Change-Id: Ic6ffd7a5177959db96a34a24896b242ee5b09e41
parent 34fd8a16

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -398,6 +398,8 @@ $(call add-clean-step, rm -rf $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/ 
$(call add-clean-step, rm -rf $(HOST_OUT_TESTCASES))

$(call add-clean-step, rm -rf $(TARGET_OUT_TESTCASES))



$(call add-clean-step, rm -rf $(TARGET_OUT_ETC)/init)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/base_rules.mk

+17 −17
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ my_module_path := $(strip $(LOCAL_MODULE_PATH)) 
endif

my_module_path := $(patsubst %/,%,$(my_module_path))

my_module_relative_path := $(strip $(LOCAL_MODULE_RELATIVE_PATH))

ifeq ($(my_module_path),)

ifdef LOCAL_IS_HOST_MODULE

  partition_tag :=

else
@@ -181,6 +180,7 @@ ifeq ($(my_module_path),) 
  partition_tag := $(if $(call should-install-to-system,$(my_module_tags)),,_DATA)

endif

endif

ifeq ($(my_module_path),)

  install_path_var := $(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT$(partition_tag)_$(LOCAL_MODULE_CLASS)

  ifeq (true,$(LOCAL_PRIVILEGED_MODULE))

    install_path_var := $(install_path_var)_PRIVILEGED