Merge "Use art-notices-for-framework-stubs-jar instead of filegroup" am: 23d37487df

Change-Id: I02f1433883e71e9085d6681ed81f8158afe51243
2020-03-26 17:04:16 +00:00
parent f7f22f2539 23d37487df
commit 67b9d32a7d
1 changed files with 6 additions and 4 deletions
--- 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,