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

Commit 8b8b9b6b authored by Dan Willemsen's avatar Dan Willemsen Committed by Gerrit Code Review
Browse files

Merge changes from topic "rm_ONE_SHOT_MAKEFILE" 

* changes:
  Remove [jni_]link_type files
  Remove support for ONE_SHOT_MAKEFILE
parents 8d8e3d61 0df0f6bb

CleanSpec.mk

+3 −0
Original line number Diff line number Diff line
@@ -643,6 +643,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/odm/build.prop) 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/generic*/*/product)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/generic*/*/system_ext)



# link_type and jni_link_type files are no longer needed

$(call add-clean-step, find $(OUT_DIR) -type f -name "*link_type" -print0 | xargs -0 rm -f)



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

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

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

core/Makefile

+6 −11
Original line number Diff line number Diff line
@@ -1346,19 +1346,14 @@ $(installed_system_ext_notice_xml_gz): $(target_system_ext_notice_file_xml_gz) 
$(installed_odm_notice_xml_gz): $(target_odm_notice_file_xml_gz)

	$(copy-file-to-target)



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

ALL_DEFAULT_INSTALLED_MODULES += $(installed_odm_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
@@ -1403,15 +1403,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 −4
Original line number Diff line number Diff line
@@ -138,6 +138,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
@@ -470,9 +473,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 :=
@@ -604,7 +604,6 @@ TUNE2FS := $(HOST_OUT_EXECUTABLES)/tune2fs$(HOST_EXECUTABLE_SUFFIX) 
JARJAR := $(HOST_OUT_JAVA_LIBRARIES)/jarjar.jar

DATA_BINDING_COMPILER := $(HOST_OUT_JAVA_LIBRARIES)/databinding-compiler.jar

FAT16COPY := build/make/tools/fat16copy.py

CHECK_LINK_TYPE := build/make/tools/check_link_type.py

CHECK_ELF_FILE := build/make/tools/check_elf_file.py

LPMAKE := $(HOST_OUT_EXECUTABLES)/lpmake$(HOST_EXECUTABLE_SUFFIX)

BUILD_IMAGE := $(HOST_OUT_EXECUTABLES)/build_image$(HOST_EXECUTABLE_SUFFIX)

core/java_common.mk

+0 −4
Original line number Diff line number Diff line
@@ -494,13 +494,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)