Merge "Use prebuild modules even when coverage is enabled." into sc-dev am: fe1d6c535c am: b6676298e7 am: cecc49638f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15472697
Change-Id: Iccd9fa241a740b812af2b8ba119bf1f4dcb4e15e
diff --git a/cc/config/vndk.go b/cc/config/vndk.go
index 1dfdc2d..fe9a924 100644
--- a/cc/config/vndk.go
+++ b/cc/config/vndk.go
@@ -73,6 +73,8 @@
"android.hardware.security.sharedsecret-V1-ndk_platform",
"android.hardware.security.sharedsecret-ndk_platform",
"android.hardware.security.sharedsecret-unstable-ndk_platform",
+ "android.hardware.soundtrigger3-V1-ndk",
+ "android.hardware.soundtrigger3-V1-ndk_platform",
"android.hardware.vibrator-V1-ndk_platform",
"android.hardware.vibrator-V2-ndk",
"android.hardware.vibrator-V2-ndk_platform",
@@ -86,6 +88,7 @@
"android.system.keystore2-V1-ndk_platform",
"android.system.keystore2-ndk_platform",
"android.system.keystore2-unstable-ndk_platform",
+ "android.system.suspend-V1-ndk",
"android.system.suspend-V1-ndk_platform",
"libbinder",
"libcrypto",
diff --git a/java/robolectric.go b/java/robolectric.go
index f216425..5d62aee 100644
--- a/java/robolectric.go
+++ b/java/robolectric.go
@@ -417,8 +417,10 @@
}
runtimeFromSourceJar := android.OutputFileForModule(ctx, runtimeFromSourceModule, "")
- runtimeName := fmt.Sprintf("android-all-%s-robolectric-r0.jar",
- ctx.Config().PlatformSdkCodename())
+ // "TREE" name is essential here because it hooks into the "TREE" name in
+ // Robolectric's SdkConfig.java that will always correspond to the NEWEST_SDK
+ // in Robolectric configs.
+ runtimeName := "android-all-current-robolectric-r0.jar"
installedRuntime := ctx.InstallFile(androidAllDir, runtimeName, runtimeFromSourceJar)
r.runtimes = append(r.runtimes, installedRuntime)
}