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

Commit 479311bc authored by Dan Willemsen's avatar Dan Willemsen
Browse files

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
parent 7f016150

core/base_rules.mk

+0 −14
Original line number Diff line number Diff line
@@ -299,26 +299,12 @@ $(foreach c, $(my_path_components),\ 
## 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

  # 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)

ifneq ($(LOCAL_ACP_UNAVAILABLE),true)

$(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE)

	@echo "Install: $@"

	$(copy-file-to-new-target)

	$(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.

my_init_rc_installed :=

core/clear_vars.mk

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ LOCAL_EXPORT_PACKAGE_RESOURCES:= 
LOCAL_MANIFEST_PACKAGE_NAME:=

LOCAL_PACKAGE_SPLITS:=

LOCAL_REQUIRED_MODULES:=

LOCAL_ACP_UNAVAILABLE:=

LOCAL_MODULE_TAGS:=

LOCAL_SRC_FILES:=

LOCAL_SRC_FILES_EXCLUDE:=

core/dynamic_binary.mk

+0 −9
Original line number Diff line number Diff line
@@ -144,18 +144,9 @@ endif 
else

# 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.

#

# If the binary we're copying is acp or a prerequisite,

# use cp(1) instead.

ifneq ($(LOCAL_ACP_UNAVAILABLE),true)

$(strip_output): $(strip_input)

	@echo "target Unstripped: $(PRIVATE_MODULE) ($@)"

	$(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



$(cleantarget): PRIVATE_CLEAN_FILES += \

core/prebuilt_internal.mk

+0 −5
Original line number Diff line number Diff line
@@ -279,13 +279,8 @@ ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),) 
$(built_module) : $(my_prebuilt_src_file)

	$(transform-prebuilt-to-target-strip-comments)

else

ifneq ($(LOCAL_ACP_UNAVAILABLE),true)

$(built_module) : $(my_prebuilt_src_file)

	$(transform-prebuilt-to-target)

else

$(built_module) : $(my_prebuilt_src_file)

	$(copy-file-to-target-with-cp)

endif

endif

endif # LOCAL_MODULE_CLASS != APPS

libs/host/Android.mk

+0 −4
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/include 
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include

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 toolchain prebuilt modules if they exist.