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

Commit 8d0fda5f authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Fix init rc installation in vendor when LOCAL_MODULE_PATH is set" 

am: 74dcb9fe

Change-Id: Ic24032389bf1cf8fea7afdcc25fb05fc50bd7582
parents 0c2bd309 74dcb9fe

CleanSpec.mk

+2 −0
Original line number Original line 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 $(HOST_OUT_TESTCASES))

$(call add-clean-step, rm -rf $(TARGET_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

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

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

core/base_rules.mk

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

endif

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

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

my_module_relative_path := $(strip $(LOCAL_MODULE_RELATIVE_PATH))

my_module_relative_path := $(strip $(LOCAL_MODULE_RELATIVE_PATH))

ifeq ($(my_module_path),)

ifdef LOCAL_IS_HOST_MODULE

ifdef LOCAL_IS_HOST_MODULE

  partition_tag :=

  partition_tag :=

else

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

  partition_tag := $(if $(call should-install-to-system,$(my_module_tags)),,_DATA)

endif

endif

endif

endif

ifeq ($(my_module_path),)

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

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

  ifeq (true,$(LOCAL_PRIVILEGED_MODULE))

  ifeq (true,$(LOCAL_PRIVILEGED_MODULE))

    install_path_var := $(install_path_var)_PRIVILEGED

    install_path_var := $(install_path_var)_PRIVILEGED