diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-10-20 03:56:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-10-20 03:56:21 +0000 |
| commit | 59d3d9296a5e018a9868fbc16a2aa0a1e49f4eb2 (patch) | |
| tree | 01be46b1b57282f56ffee186e2e8b71d93b9366e | |
| parent | f03f8ab3bfabc6600f967e9506f6d243cf1316a1 (diff) | |
| parent | a65032ba867c89f63a25f14c778f6bf515ff2b15 (diff) | |
| download | freetype-main-16k.tar.gz | |
Merge "Merge "Clarify licensing: FTL OR GPL choose FTL." am: fce7582be9" into main-16kmain-16k
| -rw-r--r-- | Android.bp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp index 90c3ce8ac..dc5104d73 100644 --- a/Android.bp +++ b/Android.bp @@ -22,9 +22,6 @@ license { license_kinds: [ "SPDX-license-identifier-BSD", "SPDX-license-identifier-FTL", - "SPDX-license-identifier-GPL", - "SPDX-license-identifier-GPL-2.0", - "SPDX-license-identifier-GPL-3.0", "SPDX-license-identifier-ISC", "SPDX-license-identifier-LGPL", "SPDX-license-identifier-MIT", @@ -32,6 +29,7 @@ license { "legacy_unencumbered", ], license_text: [ + "LICENSE.TXT", "NOTICE", ], } |