Snap for 10453563 from e0f72e00557b09796a33ee72424c6bdadcc92153 to mainline-media-releaseaml_med_341619000aml_med_341513600aml_med_341312300aml_med_341312020aml_med_341111000aml_med_341011000aml_med_340922010android14-mainline-media-release

Change-Id: I3ad7ff906899fd4afc12c497ddec382935b0819b

2 files changed, 1 insertions, 7 deletions

diff --git a/Android.bp b/Android.bp
index 5452aff4..6b95b2fb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -66,11 +66,6 @@ license {
     license_text: ["licenses/mingw-w64-svn-r5861/mingw-w64-libraries/winpthreads/COPYING"],
 }
 
-filegroup {
-    name: "mingw-libwinpthread-notice",
-    srcs: ["licenses/mingw-w64-svn-r5861/mingw-w64-libraries/winpthreads/COPYING"],
-}
-
 cc_prebuilt_library_shared {
     name: "libwinpthread-1",
     host_supported: true,
@@ -111,6 +106,5 @@ cc_prebuilt_library_static {
         },
     },
     stl: "none",
-    notice: ":mingw-libwinpthread-notice",
     licenses: ["winpthreads_license"],
 }
diff --git a/METADATA b/METADATA
index 582e5581..c956d153 100644
--- a/METADATA
+++ b/METADATA
@@ -5,7 +5,7 @@ third_party {
   license_note: "would be RESTRICTED save for GFDL in:\n"
   "   share/man/\n"
   "   share/info/\n"
-  " and save for "no derivatives" restriction in:\n"
+  " and save for 'no derivatives' restriction in:\n"
   "   share/man/man7/fsf-funding.7"
   license_type: BY_EXCEPTION_ONLY
 }