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

Commit 32fefc24 authored by Liz Kammer's avatar Liz Kammer Committed by Android (Google) Code Review
Browse files

Merge "Make framework-res dep in stubs explicit am: 47994f37" into mainline-prod

parents 53487145 a66eacf8

StubLibraries.bp

+3 −0
Original line number Diff line number Diff line
@@ -295,6 +295,9 @@ droidstubs { 
java_defaults {

    name: "android_defaults_stubs_current",

    libs: [ "stub-annotations" ],

    static_libs: [

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

    ],

    errorprone: {

        javacflags: [

            "-XepDisableAllChecks",

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",