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

Commit 54082dd8 authored by Dennis Shen's avatar Dennis Shen Committed by Gerrit Code Review
Browse files

Merge "Soong: remove obsolete proto lib from unit test" into main

parents c15b0234 6a7ffb3e

aconfig/codegen/cc_aconfig_library_test.go

+0 −17
Original line number Diff line number Diff line
@@ -74,11 +74,6 @@ func testCCCodegenModeHelper(t *testing.T, bpMode string, ruleMode string) { 
    		srcs: ["libaconfig_storage_read_api_cc.cc"],

			}



			cc_library {

    		name: "libaconfig_storage_protos_cc",

    		srcs: ["libaconfig_storage_protos_cc.cc"],

			}



			cc_aconfig_library {

				name: "my_cc_aconfig_library",

				aconfig_declarations: "my_aconfig_declarations",
@@ -137,12 +132,6 @@ func testIncorrectCCCodegenModeHelper(t *testing.T, bpMode string, err string) { 
    		srcs: ["libaconfig_storage_read_api_cc.cc"],

			}



			cc_library {

    		name: "libaconfig_storage_protos_cc",

    		srcs: ["libaconfig_storage_protos_cc.cc"],

			}





			cc_aconfig_library {

				name: "my_cc_aconfig_library",

				aconfig_declarations: "my_aconfig_declarations",
@@ -214,12 +203,6 @@ func TestAndroidMkCcLibrary(t *testing.T) { 
			srcs: ["libaconfig_storage_read_api_cc.cc"],

			vendor_available: true,

		}



		cc_library {

			name: "libaconfig_storage_protos_cc",

			srcs: ["libaconfig_storage_protos_cc.cc"],

			vendor_available: true,

		}

	`

	result := android.GroupFixturePreparers(

		PrepareForTestWithAconfigBuildComponents,

apex/aconfig_test.go

+1 −12
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import ( 
	"android/soong/genrule"

	"android/soong/java"

	"android/soong/rust"



	"github.com/google/blueprint/proptools"

)
@@ -173,10 +174,6 @@ func TestValidationAcrossContainersExportedPass(t *testing.T) { 
					name: "libaconfig_storage_read_api_cc",

					srcs: ["libaconfig_storage_read_api_cc.cc"],

				}

				cc_library {

					name: "libaconfig_storage_protos_cc",

					srcs: ["libaconfig_storage_protos_cc.cc"],

				}

				aconfig_declarations {

					name: "my_aconfig_declarations_bar",

					package: "com.example.package",
@@ -436,10 +433,6 @@ func TestValidationAcrossContainersNotExportedFail(t *testing.T) { 
					name: "libaconfig_storage_read_api_cc",

					srcs: ["libaconfig_storage_read_api_cc.cc"],

				}

				cc_library {

					name: "libaconfig_storage_protos_cc",

					srcs: ["libaconfig_storage_protos_cc.cc"],

				}

				aconfig_declarations {

					name: "my_aconfig_declarations_foo",

					package: "com.example.package",
@@ -501,10 +494,6 @@ func TestValidationAcrossContainersNotExportedFail(t *testing.T) { 
					name: "libaconfig_storage_read_api_cc",

					srcs: ["libaconfig_storage_read_api_cc.cc"],

				}

				cc_library {

					name: "libaconfig_storage_protos_cc",

					srcs: ["libaconfig_storage_protos_cc.cc"],

				}

				aconfig_declarations {

					name: "my_aconfig_declarations_foo",

					package: "com.example.package",

apex/apex_test.go

+0 −4
Original line number Diff line number Diff line
@@ -10709,10 +10709,6 @@ func TestAconfigFilesJavaAndCcDeps(t *testing.T) { 
			name: "libaconfig_storage_read_api_cc",

			srcs: ["libaconfig_storage_read_api_cc.cc"],

		}

		cc_library {

			name: "libaconfig_storage_protos_cc",

			srcs: ["libaconfig_storage_protos_cc.cc"],

		}

	`)



	mod := ctx.ModuleForTests("myapex", "android_common_myapex")