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

Commit a4726214 authored by Dan Willemsen's avatar Dan Willemsen Committed by Luca Stefani
Browse files

Remove support for ONE_SHOT_MAKEFILE 

Test: treehugger
Change-Id: Ie73418c186ec4c0e1c91078c133de8f8113295bf
parent 3ea59b8a

core/Makefile

+5 −10
Original line number Diff line number Diff line
@@ -1191,18 +1191,13 @@ $(installed_product_services_notice_xml_gz): $(target_product_services_notice_fi 
	$(copy-file-to-target)

endif



# if we've been run my mm, mmm, etc, don't reinstall this every time

ifeq ($(ONE_SHOT_MAKEFILE),)

ALL_DEFAULT_INSTALLED_MODULES += $(installed_notice_html_or_xml_gz)

ALL_DEFAULT_INSTALLED_MODULES += $(installed_vendor_notice_xml_gz)

ALL_DEFAULT_INSTALLED_MODULES += $(installed_product_notice_xml_gz)

ALL_DEFAULT_INSTALLED_MODULES += $(installed_product_services_notice_xml_gz)

endif

endif # PRODUCT_NOTICE_SPLIT



ifeq ($(ONE_SHOT_MAKEFILE),)

ALL_DEFAULT_INSTALLED_MODULES += $(installed_notice_html_or_xml_gz)

endif



$(eval $(call combine-notice-files, html, \

	        $(tools_notice_file_txt), \

core/binary.mk

+0 −6
Original line number Diff line number Diff line
@@ -1389,15 +1389,9 @@ built_whole_libraries := \ 
# libraries have already been linked into the module at that point.

# We do, however, care about the NOTICE files for any static

# libraries that we use. (see notice_files.mk)

#

# Don't do this in mm, since many of the targets won't exist.

ifeq ($(ONE_SHOT_MAKEFILE),)

installed_static_library_notice_file_targets := \

    $(foreach lib,$(my_static_libraries) $(my_whole_static_libraries), \

      NOTICE-$(if $(LOCAL_IS_HOST_MODULE),HOST$(if $(my_host_cross),_CROSS,),TARGET)-STATIC_LIBRARIES-$(lib))

else

installed_static_library_notice_file_targets :=

endif



$(notice_target): | $(installed_static_library_notice_file_targets)

$(LOCAL_INSTALLED_MODULE): | $(notice_target)

core/config.mk

+3 −3
Original line number Diff line number Diff line
@@ -115,6 +115,9 @@ ifdef TARGET_DEVICE_DIR 
  .KATI_READONLY := TARGET_DEVICE_DIR

endif



ONE_SHOT_MAKEFILE :=

.KATI_READONLY := ONE_SHOT_MAKEFILE



# Set up efficient math functions which are used in make.

# Here since this file is included by envsetup as well as during build.

include $(BUILD_SYSTEM_COMMON)/math.mk
@@ -443,9 +446,6 @@ endif 
ifneq ($(filter true,$(SOONG_ALLOW_MISSING_DEPENDENCIES)),)

ALLOW_MISSING_DEPENDENCIES := true

endif

ifneq ($(ONE_SHOT_MAKEFILE),)

ALLOW_MISSING_DEPENDENCIES := true

endif

.KATI_READONLY := ALLOW_MISSING_DEPENDENCIES



TARGET_BUILD_APPS_USE_PREBUILT_SDK :=

core/java_common.mk

+0 −4
Original line number Diff line number Diff line
@@ -497,13 +497,9 @@ ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR := \ 
##########################################################

# Copy NOTICE files of transitive static dependencies

# Don't do this in mm, since many of the targets won't exist.

ifeq ($(ONE_SHOT_MAKEFILE),)

installed_static_library_notice_file_targets := \

    $(foreach lib,$(LOCAL_STATIC_JAVA_LIBRARIES), \

      NOTICE-$(if $(LOCAL_IS_HOST_MODULE),HOST$(if $(my_host_cross),_CROSS,),TARGET)-JAVA_LIBRARIES-$(lib))

else

installed_static_library_notice_file_targets :=

endif



$(notice_target): | $(installed_static_library_notice_file_targets)

$(LOCAL_INSTALLED_MODULE): | $(notice_target)

core/main.mk

+0 −39
Original line number Diff line number Diff line
@@ -429,43 +429,6 @@ endef 
subdir_makefiles_inc := .

FULL_BUILD :=



ifneq ($(ONE_SHOT_MAKEFILE),)

# We've probably been invoked by the "mm" shell function

# with a subdirectory's makefile.

include $(SOONG_ANDROID_MK) $(wildcard $(ONE_SHOT_MAKEFILE))

# Change CUSTOM_MODULES to include only modules that were

# defined by this makefile; this will install all of those

# modules as a side-effect.  Do this after including ONE_SHOT_MAKEFILE

# so that the modules will be installed in the same place they

# would have been with a normal make.

CUSTOM_MODULES := $(sort $(call get-tagged-modules,$(ALL_MODULE_TAGS)))



# A helper goal printing out install paths

define register_module_install_path

.PHONY: GET-MODULE-INSTALL-PATH-$(1)

GET-MODULE-INSTALL-PATH-$(1):

	echo 'INSTALL-PATH: $(1) $(ALL_MODULES.$(1).INSTALLED)'

endef



SORTED_ALL_MODULES := $(sort $(ALL_MODULES))

UNIQUE_ALL_MODULES :=

$(foreach m,$(SORTED_ALL_MODULES),\

    $(if $(call streq,$(m),$(lastword $(UNIQUE_ALL_MODULES))),,\

        $(eval UNIQUE_ALL_MODULES += $(m))))

SORTED_ALL_MODULES :=



$(foreach mod,$(UNIQUE_ALL_MODULES),$(if $(ALL_MODULES.$(mod).INSTALLED),\

    $(eval $(call register_module_install_path,$(mod)))\

    $(foreach path,$(ALL_MODULES.$(mod).PATH),\

        $(eval my_path_prefix := GET-INSTALL-PATH-IN)\

        $(foreach component,$(subst /,$(space),$(path)),\

            $(eval my_path_prefix := $$(my_path_prefix)-$$(component))\

            $(eval .PHONY: $$(my_path_prefix))\

            $(eval $$(my_path_prefix): GET-MODULE-INSTALL-PATH-$(mod))))))

UNIQUE_ALL_MODULES :=



else # ONE_SHOT_MAKEFILE



ifneq ($(dont_bother),true)

FULL_BUILD := true

#
@@ -487,8 +450,6 @@ droid_targets : blueprint_tools 


endif # dont_bother



endif # ONE_SHOT_MAKEFILE



ifndef subdir_makefiles_total

subdir_makefiles_total := $(words init post finish)

endif