Merge changes from topic "metalics"

* changes:
  Define the standard license_kind rules.
  Export soong license data to make.
  Add ability to declare licenses in soong.

1 files changed, 3 insertions, 0 deletions

diff --git a/android/defaults.go b/android/defaults.go
index 44753ce22..aacfbacc6 100644
--- a/android/defaults.go
+++ b/android/defaults.go
@@ -204,6 +204,9 @@ func InitDefaultsModule(module DefaultsModule) {
 	// its checking phase and parsing phase so add it to the list as a normal property.
 	AddVisibilityProperty(module, "visibility", &commonProperties.Visibility)
 
+	// The applicable licenses property for defaults is 'licenses'.
+	setPrimaryLicensesProperty(module, "licenses", &commonProperties.Licenses)
+
 	base.module = module
 }