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

am 11a38e7a: Merge "Support LOCAL_INIT_RC."

Browse Source 
* commit '11a38e7a9164bc3268344ce716c4bd12b08cb05c':
  Support LOCAL_INIT_RC.
This commit is contained in:
Ying Wang
2015-08-20 20:53:32 +00:00
committed by Android Git Automerger
parent 896d0ee2cf 11a38e7a91
commit 8a3241e39a
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/base_rules.mk
View File

@@ -564,8 +564,25 @@ $(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE)
$(copy-file-to-target-with-cp) $(copy-file-to-target-with-cp)
endif endif
endif # !LOCAL_UNINSTALLABLE_MODULE # 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 :=
ifndef my_init_rc
my_init_rc := $(LOCAL_INIT_RC)
# Make sure we don't define the rule twice in multilib module.
LOCAL_INIT_RC :=
endif
ifdef my_init_rc
my_init_rc_src := $(LOCAL_PATH)/$(my_init_rc)
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)
endif # my_init_rc
endif # !LOCAL_UNINSTALLABLE_MODULE
########################################################### ###########################################################
## CHECK_BUILD goals ## CHECK_BUILD goals
@@ -614,9 +631,12 @@ ALL_MODULES.$(my_register_name).BUILT := \
$(ALL_MODULES.$(my_register_name).BUILT) $(LOCAL_BUILT_MODULE) $(ALL_MODULES.$(my_register_name).BUILT) $(LOCAL_BUILT_MODULE)
ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))
ALL_MODULES.$(my_register_name).INSTALLED := \ ALL_MODULES.$(my_register_name).INSTALLED := \
$(strip $(ALL_MODULES.$(my_register_name).INSTALLED) $(LOCAL_INSTALLED_MODULE)) $(strip $(ALL_MODULES.$(my_register_name).INSTALLED) \
$(LOCAL_INSTALLED_MODULE) $(my_init_rc_installed))
ALL_MODULES.$(my_register_name).BUILT_INSTALLED := \ ALL_MODULES.$(my_register_name).BUILT_INSTALLED := \
$(strip $(ALL_MODULES.$(my_register_name).BUILT_INSTALLED) $(LOCAL_BUILT_MODULE):$(LOCAL_INSTALLED_MODULE)) $(strip $(ALL_MODULES.$(my_register_name).BUILT_INSTALLED) \
$(LOCAL_BUILT_MODULE):$(LOCAL_INSTALLED_MODULE) \
$(addprefix $(my_init_rc_src):,$(my_init_rc_installed)))
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

3
core/clear_vars.mk
View File

@@ -174,6 +174,7 @@ LOCAL_DPI_FILE_STEM:=
LOCAL_SANITIZE:= LOCAL_SANITIZE:=
LOCAL_SANITIZE_RECOVER:= LOCAL_SANITIZE_RECOVER:=
LOCAL_DBUS_PROXY_PREFIX:= LOCAL_DBUS_PROXY_PREFIX:=
LOCAL_INIT_RC:=
# arch specific variables # arch specific variables
LOCAL_SRC_FILES_$(TARGET_ARCH):= LOCAL_SRC_FILES_$(TARGET_ARCH):=
@@ -281,6 +282,8 @@ LOCAL_MODULE_STEM_32:=
LOCAL_MODULE_STEM_64:= LOCAL_MODULE_STEM_64:=
LOCAL_CLANG_32:= LOCAL_CLANG_32:=
LOCAL_CLANG_64:= LOCAL_CLANG_64:=
LOCAL_INIT_RC_32:=
LOCAL_INIT_RC_64:=
# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to # Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to
# iterate over thousands of entries every time. # iterate over thousands of entries every time.