tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am d4cc9dad: am 1427f872: am 676e11fe: Merge "include LGPL projects in GPL archives"

Browse source 
* commit 'd4cc9dad6cf21e12b45b8b756a731d6e21c86c97':
  include LGPL projects in GPL archives
This commit is contained in:
Ying Wang 2014-04-25 22:52:04 +00:00 committed by Android Git Automerger
commit 66750e6395
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/base_rules.mk
View file

@ -84,11 +84,10 @@ endif
# Add implicit tags. # Add implicit tags.
# #
# If the local directory or one of its parents contains a MODULE_LICENSE_GPL # If the local directory or one of its parents contains a MODULE_LICENSE_GPL
# file, tag the module as "gnu". Search for "*_GPL*" and "*_MPL*" so that we can also # file, tag the module as "gnu". Search for "*_GPL*", "*_LGPL*" and "*_MPL*"
# find files like MODULE_LICENSE_GPL_AND_AFL but exclude files like # so that we can also find files like MODULE_LICENSE_GPL_AND_AFL
# MODULE_LICENSE_LGPL.
# #
gpl_license_file := $(call find-parent-file,$(LOCAL_PATH),MODULE_LICENSE*_GPL* MODULE_LICENSE*_MPL*) gpl_license_file := $(call find-parent-file,$(LOCAL_PATH),MODULE_LICENSE*_GPL* MODULE_LICENSE*_MPL* MODULE_LICENSE*_LGPL*)
ifneq ($(gpl_license_file),) ifneq ($(gpl_license_file),)
my_module_tags += gnu my_module_tags += gnu
ALL_GPL_MODULE_LICENSE_FILES := $(sort $(ALL_GPL_MODULE_LICENSE_FILES) $(gpl_license_file)) ALL_GPL_MODULE_LICENSE_FILES := $(sort $(ALL_GPL_MODULE_LICENSE_FILES) $(gpl_license_file))