From a281e926fc82240eaca8d9076f6d9bb4198383b9 Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Wed, 25 Mar 2020 10:13:33 +0000
Subject: [PATCH] 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 | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/StubLibraries.bp b/StubLibraries.bp
index 0931fd4b6a740..fccb25898fa44 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -228,16 +228,18 @@ droidstubs {
 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,