Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0a846ca authored Oct 12, 2023 by Treehugger Robot Committed by Automerger Merge Worker Oct 12, 2023

Merge "TestJavaHostGeneral Fix" into main am: 452b794c am: bb2d733f am:...

Merge "TestJavaHostGeneral Fix" into main am: 452b794c am: bb2d733f am: 1b828643 am: ca52229d am: 462440e4

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2782251

Change-Id: I49d325e564f004548af1f3f6e8a75f1fb33ab1f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents c22d84d6 462440e4

bp2build/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@ bootstrap_go_package {
		"java_proto_conversion_test.go",
		"java_sdk_library_conversion_test.go",
		"java_sdk_library_import_conversion_test.go",
		"java_test_host_conversion_test.go",
		"license_conversion_test.go",
		"license_kind_conversion_test.go",
		"linker_config_conversion_test.go",

bp2build/java_test_host_conversion_test.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ func TestJavaTestHostGeneral(t *testing.T) {
		runJavaTestHostTestCase(t, Bp2buildTestCase{
		Description: "java_test_host general",
		Filesystem: map[string]string{},
		StubbedBuildDefinitions: []string{"lib_a", "lib_b"},
		StubbedBuildDefinitions: []string{"lib_a", "static_libs_a"},
		Blueprint: `
		java_test_host {
		name: "java_test_host-1",