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

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

Merge changes Ic3ef7557,If75daf11 am: b3bdf384 

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

Change-Id: I3b9c8a3d4d36cc03b6648b2c7a7b5a10706ec87d
parents 75249f9e b3bdf384

bp2build/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -44,9 +44,16 @@ bootstrap_go_package { 
        "cc_library_shared_conversion_test.go",

        "cc_library_static_conversion_test.go",

        "cc_object_conversion_test.go",

        "cc_prebuilt_library_shared_test.go",

        "conversion_test.go",

        "filegroup_conversion_test.go",

        "genrule_conversion_test.go",

        "java_binary_host_conversion_test.go",

        "java_import_conversion_test.go",

        "java_library_conversion_test.go",

        "java_library_host_conversion_test.go",

        "java_plugin_conversion_test.go",

        "java_proto_conversion_test.go",

        "performance_test.go",

        "prebuilt_etc_conversion_test.go",

        "python_binary_conversion_test.go",

bp2build/java_proto_conversion_test.go

+2 −4
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ func TestJavaProto(t *testing.T) { 


	protoLibrary := makeBazelTarget("proto_library", "java-protos_proto", attrNameToString{

		"srcs": `["a.proto"]`,

		"strip_import_prefix": `""`,

	})



	for _, tc := range testCases {
@@ -108,7 +107,6 @@ func TestJavaProtoDefault(t *testing.T) { 
		expectedBazelTargets: []string{

			makeBazelTarget("proto_library", "java-protos_proto", attrNameToString{

				"srcs": `["a.proto"]`,

				"strip_import_prefix": `""`,

			}),

			makeBazelTarget(

				"java_lite_proto_library",