tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Soong: remove obsolete proto lib from unit test

Browse source 
Bug: b/321077378
Test: m and avd
Change-Id: Ib121da201e0be38d1acd82de1487f6cfba9e696c
This commit is contained in:
Dennis Shen 2024-05-22 21:40:15 +00:00
parent b07e7fd542
commit 6a7ffb3ec0
3 changed files with 1 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
aconfig/codegen/cc_aconfig_library_test.go
View file

@ -74,11 +74,6 @@ func testCCCodegenModeHelper(t *testing.T, bpMode string, ruleMode string) {
srcs: ["libaconfig_storage_read_api_cc.cc"], srcs: ["libaconfig_storage_read_api_cc.cc"],
} }
cc_library {
name: "libaconfig_storage_protos_cc",
srcs: ["libaconfig_storage_protos_cc.cc"],
}
cc_aconfig_library { cc_aconfig_library {
name: "my_cc_aconfig_library", name: "my_cc_aconfig_library",
aconfig_declarations: "my_aconfig_declarations", 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"], srcs: ["libaconfig_storage_read_api_cc.cc"],
} }
cc_library {
name: "libaconfig_storage_protos_cc",
srcs: ["libaconfig_storage_protos_cc.cc"],
}
cc_aconfig_library { cc_aconfig_library {
name: "my_cc_aconfig_library", name: "my_cc_aconfig_library",
aconfig_declarations: "my_aconfig_declarations", aconfig_declarations: "my_aconfig_declarations",
@ -214,12 +203,6 @@ func TestAndroidMkCcLibrary(t *testing.T) {
srcs: ["libaconfig_storage_read_api_cc.cc"], srcs: ["libaconfig_storage_read_api_cc.cc"],
vendor_available: true, vendor_available: true,
} }
cc_library {
name: "libaconfig_storage_protos_cc",
srcs: ["libaconfig_storage_protos_cc.cc"],
vendor_available: true,
}
` `
result := android.GroupFixturePreparers( result := android.GroupFixturePreparers(
PrepareForTestWithAconfigBuildComponents, PrepareForTestWithAconfigBuildComponents,

13
apex/aconfig_test.go
View file

@ -23,6 +23,7 @@ import (
"android/soong/genrule" "android/soong/genrule"
"android/soong/java" "android/soong/java"
"android/soong/rust" "android/soong/rust"
"github.com/google/blueprint/proptools" "github.com/google/blueprint/proptools"
) )
@ -173,10 +174,6 @@ func TestValidationAcrossContainersExportedPass(t *testing.T) {
name: "libaconfig_storage_read_api_cc", name: "libaconfig_storage_read_api_cc",
srcs: ["libaconfig_storage_read_api_cc.cc"], srcs: ["libaconfig_storage_read_api_cc.cc"],
} }
cc_library {
name: "libaconfig_storage_protos_cc",
srcs: ["libaconfig_storage_protos_cc.cc"],
}
aconfig_declarations { aconfig_declarations {
name: "my_aconfig_declarations_bar", name: "my_aconfig_declarations_bar",
package: "com.example.package", package: "com.example.package",
@ -436,10 +433,6 @@ func TestValidationAcrossContainersNotExportedFail(t *testing.T) {
name: "libaconfig_storage_read_api_cc", name: "libaconfig_storage_read_api_cc",
srcs: ["libaconfig_storage_read_api_cc.cc"], srcs: ["libaconfig_storage_read_api_cc.cc"],
} }
cc_library {
name: "libaconfig_storage_protos_cc",
srcs: ["libaconfig_storage_protos_cc.cc"],
}
aconfig_declarations { aconfig_declarations {
name: "my_aconfig_declarations_foo", name: "my_aconfig_declarations_foo",
package: "com.example.package", package: "com.example.package",
@ -501,10 +494,6 @@ func TestValidationAcrossContainersNotExportedFail(t *testing.T) {
name: "libaconfig_storage_read_api_cc", name: "libaconfig_storage_read_api_cc",
srcs: ["libaconfig_storage_read_api_cc.cc"], srcs: ["libaconfig_storage_read_api_cc.cc"],
} }
cc_library {
name: "libaconfig_storage_protos_cc",
srcs: ["libaconfig_storage_protos_cc.cc"],
}
aconfig_declarations { aconfig_declarations {
name: "my_aconfig_declarations_foo", name: "my_aconfig_declarations_foo",
package: "com.example.package", package: "com.example.package",

4
apex/apex_test.go
View file

@ -10709,10 +10709,6 @@ func TestAconfigFilesJavaAndCcDeps(t *testing.T) {
name: "libaconfig_storage_read_api_cc", name: "libaconfig_storage_read_api_cc",
srcs: ["libaconfig_storage_read_api_cc.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") mod := ctx.ModuleForTests("myapex", "android_common_myapex")