diff options
| author | 2024-05-23 16:05:37 +0000 | |
|---|---|---|
| committer | 2024-05-23 16:05:37 +0000 | |
| commit | 54082dd8fe40fc9b1f5f74ccbb232254996fe3e4 (patch) | |
| tree | 173c9bf0db05cb3753a04c41b5b9d64d96b3a91d | |
| parent | c15b0234e982f7d76d72180781799c73057f74ea (diff) | |
| parent | 6a7ffb3ec009002587d2792205d215bd9f2a73b4 (diff) | |
Merge "Soong: remove obsolete proto lib from unit test" into main
| -rw-r--r-- | aconfig/codegen/cc_aconfig_library_test.go | 17 | ||||
| -rw-r--r-- | apex/aconfig_test.go | 13 | ||||
| -rw-r--r-- | apex/apex_test.go | 4 |
3 files changed, 1 insertions, 33 deletions
diff --git a/aconfig/codegen/cc_aconfig_library_test.go b/aconfig/codegen/cc_aconfig_library_test.go index d01d13b61..2f6c1a643 100644 --- a/aconfig/codegen/cc_aconfig_library_test.go +++ b/aconfig/codegen/cc_aconfig_library_test.go @@ -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, diff --git a/apex/aconfig_test.go b/apex/aconfig_test.go index 726041c60..14c0b6394 100644 --- a/apex/aconfig_test.go +++ b/apex/aconfig_test.go @@ -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", diff --git a/apex/apex_test.go b/apex/apex_test.go index 965b4be24..4cac0ccd4 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -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") |