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

Commit 8cf6b654 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Remove *_OUT_INTERMEDIATE_LIBRARIES 

Always use the exact libraries like Soong does instead.

Test: m
Change-Id: Ifd48020073dd045247f76f84627c497e94562286
parent d55eb764

CleanSpec.mk

+6 −0
Original line number Diff line number Diff line
@@ -503,6 +503,12 @@ $(call add-clean-step, find $(PRODUCT_OUT) -type l -name "*product-services*" -p 
# Remove obsolete recovery etc files

$(call add-clean-step, rm -rf $(TARGET_RECOVERY_ROOT_OUT)/etc)



# Remove *_OUT_INTERMEDIATE_LIBRARIES

$(call add-clean-step, rm -rf $(addsuffix /lib,\

  $(HOST_OUT_INTERMEDIATES) $(2ND_HOST_OUT_INTERMEDIATES) \

  $(HOST_CROSS_OUT_INTERMEDIATES) $(2ND_HOST_CROSS_OUT_INTERMEDIATES) \

  $(TARGET_OUT_INTERMEDIATES) $(2ND_TARGET_OUT_INTERMEDIATES)))



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

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

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

core/aux_config.mk

+0 −2
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ $(eval AUX_OUT_$(1) := $(AUX_OUT_ROOT_$(1))/$(AUX_OS_$(1))-$(AUX_ARCH_$(1))-$(AU 
$(eval AUX_OUT_INTERMEDIATES_$(1) := $(AUX_OUT_$(1))/obj) \

$(eval AUX_OUT_COMMON_INTERMEDIATES_$(1) := $(AUX_COMMON_OUT_ROOT_$(1))/obj) \

$(eval AUX_OUT_HEADERS_$(1) := $(AUX_OUT_INTERMEDIATES_$(1))/include) \

$(eval AUX_OUT_INTERMEDIATE_LIBRARIES_$(1) := $(AUX_OUT_INTERMEDIATES_$(1))/lib) \

$(eval AUX_OUT_NOTICE_FILES_$(1) := $(AUX_OUT_INTERMEDIATES_$(1))/NOTICE_FILES) \

$(eval AUX_OUT_FAKE_$(1) := $(AUX_OUT_$(1))/fake_packages) \

$(eval AUX_OUT_GEN_$(1) := $(AUX_OUT_$(1))/gen) \
@@ -78,7 +77,6 @@ $(eval AUX_OUT := $(AUX_OUT_$(1))) \ 
$(eval AUX_OUT_INTERMEDIATES := $(AUX_OUT_INTERMEDIATES_$(1))) \

$(eval AUX_OUT_COMMON_INTERMEDIATES := $(AUX_OUT_COMMON_INTERMEDIATES_$(1))) \

$(eval AUX_OUT_HEADERS := $(AUX_OUT_HEADERS_$(1))) \

$(eval AUX_OUT_INTERMEDIATE_LIBRARIES := $(AUX_OUT_INTERMEDIATE_LIBRARIES_$(1))) \

$(eval AUX_OUT_NOTICE_FILES := $(AUX_OUT_NOTICE_FILES_$(1))) \

$(eval AUX_OUT_FAKE := $(AUX_OUT_FAKE_$(1))) \

$(eval AUX_OUT_GEN := $(AUX_OUT_GEN_$(1))) \

core/aux_executable.mk

+0 −1
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ $(cleantarget): PRIVATE_CLEAN_FILES += \ 
    $(linked_module) \



# Define PRIVATE_ variables from global vars

$(linked_module): PRIVATE_TARGET_OUT_INTERMEDIATE_LIBRARIES := $(AUX_OUT_INTERMEDIATE_LIBRARIES)

$(linked_module): PRIVATE_POST_LINK_CMD := $(LOCAL_POST_LINK_CMD)



ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)

core/base_rules.mk

+0 −15
Original line number Diff line number Diff line
@@ -295,16 +295,6 @@ include $(BUILD_SYSTEM)/configure_module_stem.mk 


LOCAL_BUILT_MODULE := $(intermediates)/$(my_built_module_stem)



# OVERRIDE_BUILT_MODULE_PATH is only allowed to be used by the

# internal SHARED_LIBRARIES build files.

OVERRIDE_BUILT_MODULE_PATH := $(strip $(OVERRIDE_BUILT_MODULE_PATH))

ifdef OVERRIDE_BUILT_MODULE_PATH

  ifneq ($(LOCAL_MODULE_CLASS),SHARED_LIBRARIES)

    $(error $(LOCAL_PATH): Illegal use of OVERRIDE_BUILT_MODULE_PATH)

  endif

  $(eval $(call copy-one-file,$(LOCAL_BUILT_MODULE),$(OVERRIDE_BUILT_MODULE_PATH)/$(my_built_module_stem)))

endif



ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))

  # Apk and its attachments reside in its own subdir.

  ifeq ($(LOCAL_MODULE_CLASS),APPS)
@@ -343,11 +333,6 @@ $(LOCAL_BUILT_MODULE).toc: $(LOCAL_BUILT_MODULE) 
.KATI_RESTAT: $(LOCAL_BUILT_MODULE).toc

# Build .toc file when using mm, mma, or make $(my_register_name)

$(my_all_targets): $(LOCAL_BUILT_MODULE).toc



ifdef OVERRIDE_BUILT_MODULE_PATH

$(eval $(call copy-one-file,$(LOCAL_BUILT_MODULE).toc,$(OVERRIDE_BUILT_MODULE_PATH)/$(my_built_module_stem).toc))

$(OVERRIDE_BUILT_MODULE_PATH)/$(my_built_module_stem).toc: $(OVERRIDE_BUILT_MODULE_PATH)/$(my_built_module_stem)

endif

endif

endif

core/binary.mk

+6 −6
Original line number Diff line number Diff line
@@ -1480,9 +1480,9 @@ a_suffix := $($(my_prefix)STATIC_LIB_SUFFIX) 


ifneq ($(LOCAL_SDK_VERSION),)

built_shared_libraries := \

    $(addprefix $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT_INTERMEDIATE_LIBRARIES)/, \

      $(addsuffix $(so_suffix), \

        $(my_shared_libraries)))

    $(foreach lib,$(my_shared_libraries), \

      $(call intermediates-dir-for, \

        SHARED_LIBRARIES,$(lib),$(my_kind),,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))/$(lib)$(so_suffix))

built_shared_library_deps := $(addsuffix .toc, $(built_shared_libraries))



# Add the NDK libraries to the built module dependency
@@ -1506,9 +1506,9 @@ built_shared_libraries += \ 


else

built_shared_libraries := \

    $(addprefix $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT_INTERMEDIATE_LIBRARIES)/, \

      $(addsuffix $(so_suffix), \

        $(installed_shared_library_module_names)))

    $(foreach lib,$(installed_shared_library_module_names), \

      $(call intermediates-dir-for, \

        SHARED_LIBRARIES,$(lib),$(my_kind),,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))/$(lib)$(so_suffix))

built_shared_library_deps := $(addsuffix .toc, $(built_shared_libraries))

my_system_shared_libraries_fullpath :=

endif