Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abdb4390 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Make framework-res dep in stubs explicit" am: f0031bf3 am: dffa4110... 

Merge "Make framework-res dep in stubs explicit" am: f0031bf3 am: dffa4110 am: dcd62bce am: 318d951b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399179

Change-Id: I008e521c712d09f61c2276fe23609113326c8a5c
parents 9637c20f 318d951b

StubLibraries.bp

+1 −0
Original line number Diff line number Diff line
@@ -299,6 +299,7 @@ java_defaults { 
    static_libs: [

        // License notices from art module

        "art-notices-for-framework-stubs-jar",

        "framework-res-package-jar", // Export package of framework-res

    ],

    errorprone: {

        javacflags: [

core/res/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -46,6 +46,13 @@ android_app { 
    },

}



java_genrule {

    name: "framework-res-package-jar",

    srcs: [":framework-res{.export-package.apk}"],

    out: ["framework-res-package.jar"],

    cmd: "cp $(in) $(out)",

}



// This logic can be removed once robolectric's transition to binary resources is complete

filegroup {

    name: "robolectric_framework_raw_res_files",