commit a281e926fc82240eaca8d9076f6d9bb4198383b9
author Paul Duffin <paulduffin@google.com> Wed Mar 25 10:13:33 2020 +0000
committer Paul Duffin <paulduffin@google.com> Thu Mar 26 11:56:12 2020 +0000
tree 780f4f023982b18749277666c0d30e9729a37a15
parent 8044ce1b862a55a4cc071e0d324b36dbdaaf649c

Use art-notices-for-framework-stubs-jar instead of filegroup

Bug: 142935992
Test: m droid
      manually check android_stubs_current contains the notices
Change-Id: I55a231ff8325d3ba67bf7ccdee720d450a8ebae4

StubLibraries.bp

diff --git a/StubLibraries.bp b/StubLibraries.bp
index 0931fd4..fccb258 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -228,16 +228,18 @@
 java_defaults {
     name: "framework-stubs-default",
     libs: [ "stub-annotations" ],
-    static_libs: [ "private-stub-annotations-jar" ],
+    static_libs: [
+        "private-stub-annotations-jar",
+
+        // License notices from art module
+        "art-notices-for-framework-stubs-jar",
+    ],
     sdk_version: "core_current",
     errorprone: {
         javacflags: [
             "-XepDisableAllChecks",
         ],
     },
-    java_resources: [
-        ":notices-for-framework-stubs",
-    ],
     system_modules: "none",
     java_version: "1.8",
     compile_dex: true,