Snap for 7478067 from 2014eb07b4185c22dac7d15c602c4e079074a917 to mainline-extservices-releaseandroid-mainline-12.0.0_r9android-mainline-12.0.0_r87android-mainline-12.0.0_r72android-mainline-12.0.0_r44android-mainline-12.0.0_r27android-mainline-12.0.0_r117android-mainline-12.0.0_r102android12-mainline-extservices-release

Change-Id: Ibaa44457f12b5f9281c677190093c3b6ea593ee2

4 files changed, 36 insertions, 6 deletions

diff --git a/Android.bp b/Android.bp
index 7771723..19003b3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,33 @@
+package {
+    default_applicable_licenses: ["external_sfntly_license"],
+}
+
+// Added automatically by a large-scale-change that took the approach of
+// 'apply every license found to every target'. While this makes sure we respect
+// every license restriction, it may not be entirely correct.
+//
+// e.g. GPL in an MIT project might only apply to the contrib/ directory.
+//
+// Please consider splitting the single license below into multiple licenses,
+// taking care not to lose any license_kind information, and overriding the
+// default license using the 'licenses: [...]' property on targets as needed.
+//
+// For unused files, consider creating a 'fileGroup' with "//visibility:private"
+// to attach the license to, and including a comment whether the files may be
+// used in the current project.
+// See: http://go/android-license-faq
+license {
+    name: "external_sfntly_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-Zlib",
+    ],
+    license_text: [
+        "cpp/COPYING.txt",
+    ],
+}
+
 cc_library_static {
     name: "libsfntly",
     host_supported: true,
diff --git a/METADATA b/METADATA
index b02a109..be0ff81 100644
--- a/METADATA
+++ b/METADATA
@@ -5,10 +5,11 @@ third_party {
     type: GIT
     value: "https://github.com/googlefonts/sfntly.git"
   }
-  version: "9620b607af5b796badefebcf16d7ce6e6786f205"
+  version: "1e7adf313bd9c488a70015f8df8782f7c65e9ce7"
+  license_type: NOTICE
   last_upgrade_date {
-    year: 2019
-    month: 5
-    day: 3
+    year: 2020
+    month: 10
+    day: 28
   }
 }
diff --git a/NOTICE b/NOTICE
deleted file mode 120000
index 7a694c9..0000000
--- a/NOTICE
+++ /dev/null
@@ -1 +0,0 @@
-LICENSE
\ No newline at end of file
diff --git a/cpp/src/sample/chromium/subsetter_impl.cc b/cpp/src/sample/chromium/subsetter_impl.cc
index d6c3216..5910591 100644
--- a/cpp/src/sample/chromium/subsetter_impl.cc
+++ b/cpp/src/sample/chromium/subsetter_impl.cc
@@ -133,7 +133,7 @@ bool HasName(const char* font_name, Font* font) {
   UCharString font_string = ConvertFromUtf8(font_name);
   if (font_string.empty())
     return false;
-  UCharString regular_suffix = ConvertFromUtf8("Regular");
+  UCharString regular_suffix = ConvertFromUtf8(" Regular");
   UCharString alt_font_string = font_string;
   alt_font_string += regular_suffix;