commit 93641b23bad98066ccd99ddf78b6d76d06b5c954
author Bob Badour <bbadour@google.com> Thu Jul 14 11:42:19 2022 -0700
committer Bob Badour <bbadour@google.com> Thu Jul 14 15:07:18 2022 -0700
tree 5bdb9540d99db43f24be172655d9a07a158eae93
parent b256f3f39a7e24d7084a482f43e1fac8a5148a74

Remove redundant notice property.

Bug: 192434786

Test: m droid dist

Change-Id: I4c9e05432da8277d5ac9041f3b0bff37b7350b66

Android.bp

diff --git a/Android.bp b/Android.bp
index ba028aa..9cdf6c5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -30,7 +30,26 @@
         "SPDX-license-identifier-Zlib",
         "legacy_unencumbered",
     ],
-    // large-scale-change unable to identify any license_text files
+    license_text: [
+        "common/bison/NOTICE",
+        "common/flex/NOTICE",
+        "sysroots/aarch64-linux-musl/NOTICE.bionic",
+        "sysroots/aarch64-linux-musl/NOTICE.libc++",
+        "sysroots/aarch64-linux-musl/NOTICE.libc++abi",
+        "sysroots/aarch64-linux-musl/NOTICE.zlib",
+        "sysroots/arm-linux-musleabihf/NOTICE.bionic",
+        "sysroots/arm-linux-musleabihf/NOTICE.libc++",
+        "sysroots/arm-linux-musleabihf/NOTICE.libc++abi",
+        "sysroots/arm-linux-musleabihf/NOTICE.zlib",
+        "sysroots/i686-linux-musl/NOTICE.bionic",
+        "sysroots/i686-linux-musl/NOTICE.libc++",
+        "sysroots/i686-linux-musl/NOTICE.libc++abi",
+        "sysroots/i686-linux-musl/NOTICE.zlib",
+        "sysroots/x86_64-linux-musl/NOTICE.bionic",
+        "sysroots/x86_64-linux-musl/NOTICE.libc++",
+        "sysroots/x86_64-linux-musl/NOTICE.libc++abi",
+        "sysroots/x86_64-linux-musl/NOTICE.zlib",
+    ],
 }
 
 cc_library_headers {
@@ -40,7 +59,6 @@
     // TODO(b/153609531): remove when no longer needed.
     native_bridge_supported: true,
     export_include_dirs: ["common/flex"],
-    notice: "common/flex/NOTICE",
 }
 
 prebuilt_build_tool {
@@ -120,7 +138,6 @@
     device_supported: false,
     compile_multilib: "64",
     stl: "none",
-    notice: "common/py3-stdlib/NOTICE",
     target: {
         glibc_x86_64: {
             srcs: ["linux-x86/bin/py3-launcher64"]
@@ -148,7 +165,6 @@
     device_supported: false,
     compile_multilib: "64",
     stl: "none",
-    notice: "common/py3-stdlib/NOTICE",
     target: {
         musl_x86_64: {
             srcs: ["linux_musl-x86/bin/py3-launcher-static64"]
@@ -170,7 +186,6 @@
     device_supported: false,
     compile_multilib: "64",
     stl: "none",
-    notice: "common/py3-stdlib/NOTICE",
     target: {
         glibc_x86_64: {
             srcs: ["linux-x86/bin/py3-launcher-autorun64"]
@@ -198,7 +213,6 @@
     device_supported: false,
     compile_multilib: "64",
     stl: "none",
-    notice: "common/py3-stdlib/NOTICE",
     target: {
         musl_x86_64: {
             srcs: ["linux_musl-x86/bin/py3-launcher-autorun-static64"]