openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Remove LOCAL_ACP_UNAVAILABLE 

Now that copy-file-to-target doesn't use acp, nothing in the acp build
path uses acp, so we don't need to special case it to prevent loops.

Change-Id: I12810c1b064d0c03135a80077a76bc4c9cc18b24
This commit is contained in:
Dan Willemsen 2016-02-29 13:20:29 -08:00
parent 7f016150a0
commit 479311bc7c
6 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/base_rules.mk
View File

@ -299,26 +299,12 @@ $(foreach c, $(my_path_components),\
## Module installation rule ## Module installation rule
########################################################### ###########################################################
# Some hosts do not have ACP; override the LOCAL version if that's the case.
ifneq ($(strip $(HOST_ACP_UNAVAILABLE)),)
LOCAL_ACP_UNAVAILABLE := $(strip $(HOST_ACP_UNAVAILABLE))
endif
ifndef LOCAL_UNINSTALLABLE_MODULE ifndef LOCAL_UNINSTALLABLE_MODULE
# Define a copy rule to install the module.
# acp and libraries that it uses can't use acp for
# installation; hence, LOCAL_ACP_UNAVAILABLE.
$(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD) $(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD)
ifneq ($(LOCAL_ACP_UNAVAILABLE),true)
$(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE) $(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE)
@echo "Install: $@" @echo "Install: $@"
$(copy-file-to-new-target) $(copy-file-to-new-target)
$(PRIVATE_POST_INSTALL_CMD) $(PRIVATE_POST_INSTALL_CMD)
else
$(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE)
@echo "Install: $@"
$(copy-file-to-target-with-cp)
endif
# Rule to install the module's companion init.rc. # Rule to install the module's companion init.rc.
my_init_rc_installed := my_init_rc_installed :=

1
core/clear_vars.mk
View File

@ -25,7 +25,6 @@ LOCAL_EXPORT_PACKAGE_RESOURCES:=
LOCAL_MANIFEST_PACKAGE_NAME:= LOCAL_MANIFEST_PACKAGE_NAME:=
LOCAL_PACKAGE_SPLITS:= LOCAL_PACKAGE_SPLITS:=
LOCAL_REQUIRED_MODULES:= LOCAL_REQUIRED_MODULES:=
LOCAL_ACP_UNAVAILABLE:=
LOCAL_MODULE_TAGS:= LOCAL_MODULE_TAGS:=
LOCAL_SRC_FILES:= LOCAL_SRC_FILES:=
LOCAL_SRC_FILES_EXCLUDE:= LOCAL_SRC_FILES_EXCLUDE:=

9
core/dynamic_binary.mk
View File

@ -144,18 +144,9 @@ endif
else else
# Don't strip the binary, just copy it. We can't skip this step # Don't strip the binary, just copy it. We can't skip this step
# because a copy of the binary must appear at LOCAL_BUILT_MODULE. # because a copy of the binary must appear at LOCAL_BUILT_MODULE.
#
# If the binary we're copying is acp or a prerequisite,
# use cp(1) instead.
ifneq ($(LOCAL_ACP_UNAVAILABLE),true)
$(strip_output): $(strip_input) $(strip_output): $(strip_input)
@echo "target Unstripped: $(PRIVATE_MODULE) ($@)" @echo "target Unstripped: $(PRIVATE_MODULE) ($@)"
$(copy-file-to-target) $(copy-file-to-target)
else
$(strip_output): $(strip_input)
@echo "target Unstripped: $(PRIVATE_MODULE) ($@)"
$(copy-file-to-target-with-cp)
endif
endif # my_strip_module endif # my_strip_module
$(cleantarget): PRIVATE_CLEAN_FILES += \ $(cleantarget): PRIVATE_CLEAN_FILES += \

5
core/prebuilt_internal.mk
View File

@ -279,13 +279,8 @@ ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),)
$(built_module) : $(my_prebuilt_src_file) $(built_module) : $(my_prebuilt_src_file)
$(transform-prebuilt-to-target-strip-comments) $(transform-prebuilt-to-target-strip-comments)
else else
ifneq ($(LOCAL_ACP_UNAVAILABLE),true)
$(built_module) : $(my_prebuilt_src_file) $(built_module) : $(my_prebuilt_src_file)
$(transform-prebuilt-to-target) $(transform-prebuilt-to-target)
else
$(built_module) : $(my_prebuilt_src_file)
$(copy-file-to-target-with-cp)
endif
endif endif
endif # LOCAL_MODULE_CLASS != APPS endif # LOCAL_MODULE_CLASS != APPS

4
libs/host/Android.mk
View File

@ -12,10 +12,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_CXX_STL := none LOCAL_CXX_STL := none
# acp uses libhost, so we can't use
# acp to install libhost.
LOCAL_ACP_UNAVAILABLE:= true
include $(BUILD_HOST_STATIC_LIBRARY) include $(BUILD_HOST_STATIC_LIBRARY)
# Include toolchain prebuilt modules if they exist. # Include toolchain prebuilt modules if they exist.

1
tools/acp/Android.mk
View File

@ -11,7 +11,6 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_LIBRARIES := libhost LOCAL_STATIC_LIBRARIES := libhost
LOCAL_MODULE := acp LOCAL_MODULE := acp
LOCAL_ACP_UNAVAILABLE := true
LOCAL_CXX_STL := none LOCAL_CXX_STL := none
include $(BUILD_HOST_EXECUTABLE) include $(BUILD_HOST_EXECUTABLE)