commit 00210d0dfdc2eff2299a2c061b42e064124967d3
author Bob Badour <bbadour@google.com> Mon Jul 18 13:23:08 2022 -0700
committer Bob Badour <bbadour@google.com> Mon Jul 18 13:24:45 2022 -0700
tree 09927a534c36985a5cb3ea7678a2ffd930dd6c35
parent bbd433d762880c7b478ba1c3f47452dcfe9d2f0b

Remove obsolete notice property.

Bug: 192434786

Test: m droid dist

Change-Id: Ib422bb26f28bd396470e9ca6717db70cc6c18cb3

Android.bp

diff --git a/Android.bp b/Android.bp
index 6d8a0f5..68f47a5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -54,6 +54,7 @@
     license_text: [
         "LICENSE",
         "NOTICE",
+        "ojluni/NOTICE",
     ],
 }
 

JavaLibrary.bp

diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index cb5b2bf..58fc749 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -292,8 +292,6 @@
         ],
     },
 
-    notice: "ojluni/NOTICE",
-
     hiddenapi_additional_annotations: [
         "core-oj-hiddenapi-annotations",
     ],
@@ -403,8 +401,6 @@
     system_modules: "core-all-system-modules",
     patch_module: "java.base",
 
-    notice: "ojluni/NOTICE",
-
     installable: false,
     include_srcs: true,
 }
@@ -460,7 +456,6 @@
     sdk_version: "none",
     system_modules: "core-all-system-modules",
     patch_module: "java.base",
-    notice: "ojluni/NOTICE",
     installable: false,
     include_srcs: true,
 }

NativeCode.bp

diff --git a/NativeCode.bp b/NativeCode.bp
index f1b7427..c6016de 100644
--- a/NativeCode.bp
+++ b/NativeCode.bp
@@ -158,8 +158,6 @@
             ],
         },
     },
-
-    notice: "ojluni/NOTICE",
 }
 
 cc_library_shared {