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

Commit 812805e8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Ravenwood] Rename all-updatable-modules-system-stubs" into main

parents cef137ef d8231fe0

CleanSpec.mk

+1 −0
Original line number Original line 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/priv-app/InProcessTethering)

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

$(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 $(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

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

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

Ravenwood.bp

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

    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 {

android_ravenwood_libgroup {

    name: "ravenwood-runtime",

    name: "ravenwood-runtime",

    libs: [

    libs: [

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

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

        "200-kxml2-android",

        "200-kxml2-android",

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



        "android.test.mock.ravenwood",

        "android.test.mock.ravenwood",

        "ravenwood-helper-runtime",

        "ravenwood-helper-runtime",

        "hoststubgen-helper-runtime.ravenwood",

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

        "ravenwood-junit-impl-flag",

        "mockito-ravenwood-prebuilt",

        "mockito-ravenwood-prebuilt",

        "inline-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: [

    jni_libs: [

        "libandroid_runtime",

        "libandroid_runtime",