Properly package JNI libs in Robo tests

Previously, the jni_libs property was ignored when packaging
robolectric-tests.zip, meaning that tests sometimes couldn't find native
libraries. This change causes any native libs that tests use to be
written alongside the .jar/.apk for Robolectric tests.

99% of this code is just stolen from the Ravenwood tests, as they work
in this area. In short though, any native libs will be built for the
host arch and put in the correct place.

Tests are a little lacking (just testing the new functionality), but I'm
not 100% sure how to test the rest of the Robolectric file.

Bug: 340801983
Test: Manually verified, `go test` in java/
Change-Id: I4ef28b1cbc4675fc329dc8fcab06d055d6538e60
This commit is contained in:
Jamie Garside
2024-07-09 12:00:12 +01:00
parent 40ca9c933b
commit 56f2b7000c
2 changed files with 116 additions and 2 deletions

View File

@@ -29,8 +29,12 @@ import (
)
func init() {
android.RegisterModuleType("android_robolectric_test", RobolectricTestFactory)
android.RegisterModuleType("android_robolectric_runtimes", robolectricRuntimesFactory)
RegisterRobolectricBuildComponents(android.InitRegistrationContext)
}
func RegisterRobolectricBuildComponents(ctx android.RegistrationContext) {
ctx.RegisterModuleType("android_robolectric_test", RobolectricTestFactory)
ctx.RegisterModuleType("android_robolectric_runtimes", robolectricRuntimesFactory)
}
var robolectricDefaultLibs = []string{
@@ -74,6 +78,8 @@ type robolectricProperties struct {
// Use strict mode to limit access of Robolectric API directly. See go/roboStrictMode
Strict_mode *bool
Jni_libs []string
}
type robolectricTest struct {
@@ -137,6 +143,10 @@ func (r *robolectricTest) DepsMutator(ctx android.BottomUpMutatorContext) {
ctx.AddFarVariationDependencies(ctx.Config().BuildOSCommonTarget.Variations(),
roboRuntimesTag, "robolectric-android-all-prebuilts")
for _, lib := range r.robolectricProperties.Jni_libs {
ctx.AddVariationDependencies(ctx.Config().BuildOSTarget.Variations(), jniLibTag, lib)
}
}
func (r *robolectricTest) GenerateAndroidBuildActions(ctx android.ModuleContext) {
@@ -270,6 +280,12 @@ func (r *robolectricTest) GenerateAndroidBuildActions(ctx android.ModuleContext)
installDeps = append(installDeps, installedData)
}
soInstallPath := installPath.Join(ctx, getLibPath(r.forceArchType))
for _, jniLib := range collectTransitiveJniDeps(ctx) {
installJni := ctx.InstallFile(soInstallPath, jniLib.path.Base(), jniLib.path)
installDeps = append(installDeps, installJni)
}
r.installFile = ctx.InstallFile(installPath, ctx.ModuleName()+".jar", r.combinedJar, installDeps...)
android.SetProvider(ctx, testing.TestModuleProviderKey, testing.TestModuleProviderData{})
}

98
java/robolectric_test.go Normal file
View File

@@ -0,0 +1,98 @@
// Copyright 2024 Google Inc. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package java
import (
"runtime"
"testing"
"android/soong/android"
)
var prepareRobolectricRuntime = android.GroupFixturePreparers(
android.FixtureRegisterWithContext(func(ctx android.RegistrationContext) {
RegisterRobolectricBuildComponents(ctx)
}),
android.FixtureAddTextFile("robolectric/Android.bp", `
java_library {
name: "Robolectric_all-target_upstream",
srcs: ["Robo.java"]
}
java_library {
name: "mockito-robolectric-prebuilt",
srcs: ["Mockito.java"]
}
java_library {
name: "truth",
srcs: ["Truth.java"]
}
java_library {
name: "junitxml",
srcs: ["JUnitXml.java"]
}
java_library_host {
name: "robolectric-host-android_all",
srcs: ["Runtime.java"]
}
android_robolectric_runtimes {
name: "robolectric-android-all-prebuilts",
jars: ["android-all/Runtime.jar"],
lib: "robolectric-host-android_all",
}
`),
)
func TestRobolectricJniTest(t *testing.T) {
if runtime.GOOS != "linux" {
t.Skip("requires linux")
}
ctx := android.GroupFixturePreparers(
PrepareForIntegrationTestWithJava,
prepareRobolectricRuntime,
).RunTestWithBp(t, `
android_app {
name: "inst-target",
srcs: ["App.java"],
platform_apis: true,
}
cc_library_shared {
name: "jni-lib1",
host_supported: true,
srcs: ["jni.cpp"],
}
android_robolectric_test {
name: "robo-test",
instrumentation_for: "inst-target",
srcs: ["FooTest.java"],
jni_libs: [
"jni-lib1"
],
}
`)
CheckModuleHasDependency(t, ctx.TestContext, "robo-test", "android_common", "jni-lib1")
// Check that the .so files make it into the output.
module := ctx.ModuleForTests("robo-test", "android_common")
module.Output(installPathPrefix + "/robo-test/lib64/jni-lib1.so")
}