diff options
| author | 2024-05-10 12:49:24 -0700 | |
|---|---|---|
| committer | 2024-07-17 13:57:46 -0700 | |
| commit | 12a7a31b677f186265a08df1e924cb6f14d11cd9 (patch) | |
| tree | f1be1e1f92f9b91c88e65b687afda8f3005d15ba | |
| parent | 7ddc87724dfb9e89afb32e3a9092163af52dc5c9 (diff) | |
[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
| -rw-r--r-- | CleanSpec.mk | 1 | ||||
| -rw-r--r-- | Ravenwood.bp | 13 |
2 files changed, 13 insertions, 1 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 02e8eecbb721..e6801034cd97 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -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 # ****************************************************************** diff --git a/Ravenwood.bp b/Ravenwood.bp index e1a096c246ac..2f902ac1ff12 100644 --- a/Ravenwood.bp +++ b/Ravenwood.bp @@ -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", |