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

Commit 19eca03f authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

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

* commit '66750e63':
  include LGPL projects in GPL archives
parents a494ae9b 66750e63

core/base_rules.mk

+3 −4
Original line number Diff line number Diff line
@@ -84,11 +84,10 @@ 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*" and "*_MPL*" so that we can also

# find files like MODULE_LICENSE_GPL_AND_AFL but exclude files like

# MODULE_LICENSE_LGPL.

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

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 := $(sort $(ALL_GPL_MODULE_LICENSE_FILES) $(gpl_license_file))