Merge "Properly package JNI libs in Robo tests" into main (60cb3a6d) · Commits · e / os / android_build_soong

java/robolectric.go

+18 −2

Original line number	Diff line number	Diff line
		@@ -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{})
		}

java/robolectric_test.go

0 → 100644

+98 −0

Original line number	Diff line number	Diff line
		// 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")
		}