Skip to content

Commit 2f3f286

Browse files
author
Makoto Onuki
committed
[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. Change-Id: I474f46b7e0844e5a887914226e5388bdf9486eb7
1 parent e8c824b commit 2f3f286

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

CleanSpec.mk

+1
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ $(call add-clean-step, rm -rf $(SOONG_OUT_DIR)/.intermediates/frameworks/base/li
262262
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/InProcessTethering)
263263
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/OsuLogin)
264264
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system_other/system/app/OsuLogin)
265+
$(call add-clean-step, rm -rf $(OUT_DIR)/host/linux-x86/testcases/ravenwood-runtime)
265266
# ******************************************************************
266267
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER
267268
# ******************************************************************

Ravenwood.bp

+12-1
Original file line numberDiff line numberDiff line change
@@ -246,12 +246,20 @@ java_genrule {
246246
visibility: ["//visibility:private"],
247247
}
248248

249+
java_genrule {
250+
name: "z00-all-updatable-modules-system-stubs",
251+
cmd: "cp $(in) $(out)",
252+
srcs: [":all-updatable-modules-system-stubs"],
253+
out: ["z00-all-updatable-modules-system-stubs.jar"],
254+
visibility: ["//visibility:private"],
255+
}
256+
249257
android_ravenwood_libgroup {
250258
name: "ravenwood-runtime",
251259
libs: [
252260
"100-framework-minus-apex.ravenwood",
253261
"200-kxml2-android",
254-
"all-updatable-modules-system-stubs",
262+
255263
"android.test.mock.ravenwood",
256264
"ravenwood-helper-runtime",
257265
"hoststubgen-helper-runtime.ravenwood",
@@ -267,6 +275,9 @@ android_ravenwood_libgroup {
267275
"ravenwood-junit-impl-flag",
268276
"mockito-ravenwood-prebuilt",
269277
"inline-mockito-ravenwood-prebuilt",
278+
279+
// It's a stub, so it should be towards the end.
280+
"z00-all-updatable-modules-system-stubs",
270281
],
271282
jni_libs: [
272283
"libandroid_runtime",

0 commit comments

Comments
 (0)