commit e827b15f981874ad39cc1cd7c128f21693ad933a
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 28 05:57:55 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 28 05:57:55 2021 +0000
tree 3b215f1a1db03fb3d54c0b49b30d24521e99d632
parent 419203136354f2ac6aed83e8ebc5c6b159fbb857
parent 77d104c31b4da04023202db91f54250fedab5fe6

Merge "Fix license_type. Contains GFDL" am: 54fe78d7d3 am: d86c7c6086 am: 6675f34534 am: 28ffdff1b4 am: 77d104c31b

Original change: https://android-review.googlesource.com/c/platform/external/flac/+/1559343

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib884e03fb0fffc0dd8a6e02d88f38326ffcdc97c

METADATA

diff --git a/METADATA b/METADATA
index c92717d..b760b2b 100644
--- a/METADATA
+++ b/METADATA
@@ -1,3 +1,6 @@
+# *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS.  PLEASE
+#     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
+#     DEPENDING ON IT IN YOUR PROJECT. ***
 name: "flac"
 description: "Android fork of the flac library."
 third_party {
@@ -6,7 +9,11 @@
     value: "https://github.com/xiph/flac.git"
   }
   version: "bfd4f13f3eb1f4d4f9f723e343f63eceedb267ba"
-  license_type: RESTRICTED
+  # Would be RESTRICTED save for GFDL in:
+  #   README
+  #   COPYING.FDL
+  #   doc/html/flac.css
+  license_type: BY_EXCEPTION_ONLY
   last_upgrade_date {
     year: 2020
     month: 12