diff options
| author | Ying Wang <wangying@android.com> | 2014-04-25 22:52:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-25 22:52:04 +0000 |
| commit | 66750e63954ca00341a5187ebd6497b4e49b0faa (patch) | |
| tree | 78d2d3bc1c69f50287028d0f597a59dd66c1f39e /core/base_rules.mk | |
| parent | 46df1818157abd7e8e7288219c3992e1ed451a47 (diff) | |
| parent | d4cc9dad6cf21e12b45b8b756a731d6e21c86c97 (diff) | |
| download | build-66750e63954ca00341a5187ebd6497b4e49b0faa.zip build-66750e63954ca00341a5187ebd6497b4e49b0faa.tar.gz build-66750e63954ca00341a5187ebd6497b4e49b0faa.tar.bz2 | |
am d4cc9dad: am 1427f872: am 676e11fe: Merge "include LGPL projects in GPL archives"
* commit 'd4cc9dad6cf21e12b45b8b756a731d6e21c86c97':
include LGPL projects in GPL archives
Diffstat (limited to 'core/base_rules.mk')
| -rw-r--r-- | core/base_rules.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 39f9abb..8676170 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -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)) |