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

Commit ab4f856b authored by Cole Faust's avatar Cole Faust
Browse files

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
parent 99d89154

core/base_rules.mk

+0 −12
Original line number Diff line number Diff line
@@ -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)")

core/definitions.mk

+0 −3
Original line number Diff line number Diff line
@@ -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 :=

core/tasks/collect_gpl_sources.mk

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
# 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))