StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don\'t ignore LOCAL_INIT_RC if LOCAL_INIT_RC_32/64 is used."

Browse Source 
am: 0e0e95e592

* commit '0e0e95e592d3538dc2e816e6d5291231b0cd47c7':
  Don't ignore LOCAL_INIT_RC if LOCAL_INIT_RC_32/64 is used.
This commit is contained in:
Ying Wang
2016-02-25 18:32:54 +00:00
committed by android-build-merger
parent 20aecac087 0e0e95e592
commit 7daeda5b80
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/base_rules.mk
View File

@@ -323,23 +323,22 @@ $(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE)
endif endif
# Rule to install the module's companion init.rc. # Rule to install the module's companion init.rc.
my_init_rc := $(LOCAL_INIT_RC_$(my_32_64_bit_suffix))
my_init_rc_src :=
my_init_rc_installed := my_init_rc_installed :=
ifndef my_init_rc my_init_rc_pairs :=
my_init_rc := $(LOCAL_INIT_RC) my_init_rc := $(LOCAL_INIT_RC_$(my_32_64_bit_suffix))
ifneq ($(my_init_rc),)
my_init_rc_pairs += $(LOCAL_PATH)/$(my_init_rc):$(TARGET_OUT$(partition_tag)_ETC)/init/$(notdir $(my_init_rc))
endif
ifneq ($(LOCAL_INIT_RC),)
my_init_rc_pairs += $(LOCAL_PATH)/$(LOCAL_INIT_RC):$(TARGET_OUT$(partition_tag)_ETC)/init/$(notdir $(LOCAL_INIT_RC))
# Make sure we don't define the rule twice in multilib module. # Make sure we don't define the rule twice in multilib module.
LOCAL_INIT_RC := LOCAL_INIT_RC :=
endif endif
ifdef my_init_rc ifneq ($(my_init_rc_pairs),)
my_init_rc_src := $(LOCAL_PATH)/$(my_init_rc) my_init_rc_installed := $(call copy-many-files,$(my_init_rc_pairs))
my_init_rc_installed := $(TARGET_OUT$(partition_tag)_ETC)/init/$(notdir $(my_init_rc_src))
$(my_init_rc_installed) : $(my_init_rc_src) | $(ACP)
@echo "Install: $@"
$(copy-file-to-new-target)
$(my_register_name) : $(my_init_rc_installed) $(my_register_name) : $(my_init_rc_installed)
endif # my_init_rc endif # my_init_rc_pairs
endif # !LOCAL_UNINSTALLABLE_MODULE endif # !LOCAL_UNINSTALLABLE_MODULE
########################################################### ###########################################################
@@ -392,7 +391,7 @@ ALL_MODULES.$(my_register_name).INSTALLED := \
ALL_MODULES.$(my_register_name).BUILT_INSTALLED := \ ALL_MODULES.$(my_register_name).BUILT_INSTALLED := \
$(strip $(ALL_MODULES.$(my_register_name).BUILT_INSTALLED) \ $(strip $(ALL_MODULES.$(my_register_name).BUILT_INSTALLED) \
$(LOCAL_BUILT_MODULE):$(LOCAL_INSTALLED_MODULE) \ $(LOCAL_BUILT_MODULE):$(LOCAL_INSTALLED_MODULE) \
$(addprefix $(my_init_rc_src):,$(my_init_rc_installed))) $(my_init_rc_pairs))
endif endif
ifdef LOCAL_PICKUP_FILES ifdef LOCAL_PICKUP_FILES
# Files or directories ready to pick up by the build system # Files or directories ready to pick up by the build system