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

Commit ca52229d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I4a0beb71c804e65fb35e7e6ce4aa27ed7e7906cc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 379bf4de 1b828643

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",