From ab4f856bbcb6e0d657d2ebc5e55bff30c873dbcf Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Thu, 11 May 2023 17:50:07 -0700 Subject: [PATCH] Remove gpl_source.tgz This file was an archive of all the gpl files that could be found in the source tree. Because it looks for gpl files using $(wildcard), kati had to rerun the wildcards every single build to see if they had changed. These GPL wildcards made up 30294 of 63996 wildcards present on aosp-master. Removing these wildcards saves (aosp/internal) ~0.2/~0.1 seconds from every build, and ~0.4/~0.6 seconds from the wildcard checking portion of kati. (The whole build sees <0.4s/0.6s of improvement because it's parallelized with the shell checking, but improvements here mean that we can now improve the shell commands as well and get more fruitful results) We don't actually use gpl_source.tgz anywhere, so we can just remove it. Bug: 282079550 Test: m nothing Change-Id: I77141dbb39b2d8ebd96bc258fe7dbdff5a372977 --- core/base_rules.mk | 12 ------------ core/definitions.mk | 3 --- core/tasks/collect_gpl_sources.mk | 29 ----------------------------- 3 files changed, 44 deletions(-) delete mode 100644 core/tasks/collect_gpl_sources.mk diff --git a/core/base_rules.mk b/core/base_rules.mk index c45346989c..65e80fb925 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -190,18 +190,6 @@ ifneq ($(filter-out tests optional samples,$(my_module_tags)),) $(call pretty-error,unusual tags: $(filter-out tests optional samples,$(my_module_tags))) endif -# Add implicit tags. -# -# If the local directory or one of its parents contains a MODULE_LICENSE_GPL -# file, tag the module as "gnu". Search for "*_GPL*", "*_LGPL*" and "*_MPL*" -# so that we can also find files like MODULE_LICENSE_GPL_AND_AFL -# -gpl_license_file := $(call find-parent-file,$(LOCAL_PATH),MODULE_LICENSE*_GPL* MODULE_LICENSE*_MPL* MODULE_LICENSE*_LGPL*) -ifneq ($(gpl_license_file),) - my_module_tags += gnu - ALL_GPL_MODULE_LICENSE_FILES += $(gpl_license_file) -endif - LOCAL_MODULE_CLASS := $(strip $(LOCAL_MODULE_CLASS)) ifneq ($(words $(LOCAL_MODULE_CLASS)),1) $(error $(LOCAL_PATH): LOCAL_MODULE_CLASS must contain exactly one word, not "$(LOCAL_MODULE_CLASS)") diff --git a/core/definitions.mk b/core/definitions.mk index e4cee7ab5a..6abd35571e 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -75,9 +75,6 @@ INTERNAL_DALVIK_MODULES:= # All findbugs xml files ALL_FINDBUGS_FILES:= -# GPL module license files -ALL_GPL_MODULE_LICENSE_FILES:= - # Packages with certificate violation CERTIFICATE_VIOLATION_MODULES := diff --git a/core/tasks/collect_gpl_sources.mk b/core/tasks/collect_gpl_sources.mk deleted file mode 100644 index 9e9ab8ecc2..0000000000 --- a/core/tasks/collect_gpl_sources.mk +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (C) 2011 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# The rule below doesn't have dependenices on the files that it copies, -# so manually generate into a PACKAGING intermediate dir, which is wiped -# in installclean between incremental builds on build servers. -gpl_source_tgz := $(call intermediates-dir-for,PACKAGING,gpl_source)/gpl_source.tgz - -ALL_GPL_MODULE_LICENSE_FILES := $(sort $(ALL_GPL_MODULE_LICENSE_FILES)) - -# FORCE since we can't know whether any of the sources changed -$(gpl_source_tgz): PRIVATE_PATHS := $(sort $(patsubst %/, %, $(dir $(ALL_GPL_MODULE_LICENSE_FILES)))) -$(gpl_source_tgz) : $(ALL_GPL_MODULE_LICENSE_FILES) - @echo Package GPL sources: $@ - $(hide) tar cfz $@ --exclude ".git*" $(PRIVATE_PATHS) - -# Dist the tgz only if we are doing a full build -$(call dist-for-goals,droidcore-unbundled,$(gpl_source_tgz))