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

Commit 12a7a31b authored by Makoto Onuki's avatar Makoto Onuki
Browse files

[Ravenwood] Rename all-updatable-modules-system-stubs 

all-updatable-modules-system-stubs is a stub, so it should be included
at the end, to avoid overriding real implementation.

Bug: 292141694
Test: ./ravenwood/scripts/run-ravenwood-tests.sh
Test: run `m` and make sure out/host/linux-x86/testcases/ravenwood-runtime
  doesn't have the un-renamed jar file.
Merged-in: I474f46b7e0844e5a887914226e5388bdf9486eb7
Change-Id: I474f46b7e0844e5a887914226e5388bdf9486eb7
parent 7ddc8772

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ $(call add-clean-step, rm -rf $(SOONG_OUT_DIR)/.intermediates/frameworks/base/li 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/InProcessTethering)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/OsuLogin)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system_other/system/app/OsuLogin)

$(call add-clean-step, rm -rf $(OUT_DIR)/host/linux-x86/testcases/ravenwood-runtime)

# ******************************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER

# ******************************************************************

Ravenwood.bp

+12 −1
Original line number Diff line number Diff line
@@ -190,12 +190,20 @@ java_genrule { 
    visibility: ["//visibility:private"],

}



java_genrule {

    name: "z00-all-updatable-modules-system-stubs",

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

    srcs: [":all-updatable-modules-system-stubs"],

    out: ["z00-all-updatable-modules-system-stubs.jar"],

    visibility: ["//visibility:private"],

}



android_ravenwood_libgroup {

    name: "ravenwood-runtime",

    libs: [

        "100-framework-minus-apex.ravenwood",

        "200-kxml2-android",

        "all-updatable-modules-system-stubs",



        "android.test.mock.ravenwood",

        "ravenwood-helper-runtime",

        "hoststubgen-helper-runtime.ravenwood",
@@ -211,6 +219,9 @@ android_ravenwood_libgroup { 
        "ravenwood-junit-impl-flag",

        "mockito-ravenwood-prebuilt",

        "inline-mockito-ravenwood-prebuilt",



        // It's a stub, so it should be towards the end.

        "z00-all-updatable-modules-system-stubs",

    ],

    jni_libs: [

        "libandroid_runtime",