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

Commit 34fe77a4 authored by Colin Cross's avatar Colin Cross
Browse files

Removed unused license code 

Nothing ever reads ALL_DEPS.*.LICENSE, and its an ever-growing list
that is sorted every time, which is extremely expensive.

notice_target is never set after I4cddf9a381a1258bdc2b1b42be72c447df10d234,
remove all the related code.

Test: no change to out/build-aosp_cf_x86_64_phone.ninja
Change-Id: I0fa6a46e62ef8aa78873b43d3064b57b1c54de51
parent aed37d79

core/base_rules.mk

+0 −3
Original line number Diff line number Diff line
@@ -1172,9 +1172,6 @@ ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS := $(sort \ 
  $(LOCAL_JAVA_LIBRARIES) \

  $(LOCAL_JNI_SHARED_LIBRARIES))



license_files := $(call find-parent-file,$(LOCAL_PATH),MODULE_LICENSE*)

ALL_DEPS.$(LOCAL_MODULE).LICENSE := $(sort $(ALL_DEPS.$(LOCAL_MODULE).LICENSE) $(license_files))



###########################################################

## umbrella targets used to verify builds

###########################################################

core/binary.mk

+0 −11
Original line number Diff line number Diff line
@@ -1437,17 +1437,6 @@ built_whole_libraries := \ 
      $(call intermediates-dir-for, \

        STATIC_LIBRARIES,$(lib),$(my_kind),,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))/$(lib)$(a_suffix))



# We don't care about installed static libraries, since the

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

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



$(notice_target): | $(installed_static_library_notice_file_targets)

$(LOCAL_INSTALLED_MODULE): | $(notice_target)



# Default is -fno-rtti.

ifeq ($(strip $(LOCAL_RTTI_FLAG)),)

LOCAL_RTTI_FLAG := -fno-rtti

core/java_common.mk

+0 −10
Original line number Diff line number Diff line
@@ -496,16 +496,6 @@ ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR := \ 
    $(ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR) $(LOCAL_INTERMEDIATE_SOURCE_DIR)





##########################################################

# Copy NOTICE files of transitive static dependencies

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

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



$(notice_target): | $(installed_static_library_notice_file_targets)

$(LOCAL_INSTALLED_MODULE): | $(notice_target)



###########################################################

# Verify that all libraries are safe to use

###########################################################

core/soong_cc_rust_prebuilt.mk

+0 −24
Original line number Diff line number Diff line
@@ -251,30 +251,6 @@ endif 


$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)



# We don't care about installed rlib/static libraries, since the libraries have

# already been linked into the module at that point. We do, however, care

# about the NOTICE files for any rlib/static libraries that we use.

# (see notice_files.mk)

#

# Filter out some NDK libraries that are not being exported.

my_static_libraries := \

    $(filter-out ndk_libc++_static ndk_libc++abi ndk_libandroid_support ndk_libunwind \

      ndk_libc++_static.native_bridge ndk_libc++abi.native_bridge \

      ndk_libandroid_support.native_bridge ndk_libunwind.native_bridge, \

      $(LOCAL_STATIC_LIBRARIES))

installed_static_library_notice_file_targets := \

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

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

installed_static_library_notice_file_targets += \

    $(foreach lib,$(LOCAL_RLIB_LIBRARIES), \

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

installed_static_library_notice_file_targets += \

    $(foreach lib,$(LOCAL_PROC_MACRO_LIBRARIES), \

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



$(notice_target): | $(installed_static_library_notice_file_targets)

$(LOCAL_INSTALLED_MODULE): | $(notice_target)



# Reinstall shared library dependencies of fuzz targets to /data/fuzz/ (for

# target) or /data/ (for host).

ifdef LOCAL_IS_FUZZ_TARGET