commit e06f8d1bd4aca263d052141dea21bf30f1692eb1
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 04:57:09 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 04:57:09 2023 +0000
tree 2c477a9d686d054c0d098d57aec7894b3260935b
parent 6150caf3294b34e7ead23515f6fe50f556e27199
parent e0f72e00557b09796a33ee72424c6bdadcc92153

Snap for 10453563 from e0f72e00557b09796a33ee72424c6bdadcc92153 to mainline-conscrypt-release

Change-Id: I4af1ef6b0e65f5958f75f021c9cc08afe1e3dbf1

Android.bp

diff --git a/Android.bp b/Android.bp
index 5452aff..6b95b2f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -66,11 +66,6 @@
     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 @@
         },
     },
     stl: "none",
-    notice: ":mingw-libwinpthread-notice",
     licenses: ["winpthreads_license"],
 }

METADATA

diff --git a/METADATA b/METADATA
index 582e558..c956d15 100644
--- a/METADATA
+++ b/METADATA
@@ -5,7 +5,7 @@
   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
 }