Merge "Soong: remove obsolete proto lib from unit test" into main am: 54082dd8fe
am: efc53b111d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3097659 Change-Id: I7dd91be78499f7192f7ed2cf1f531f25f6dfa04f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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,
|
||||
|
Reference in New Issue
Block a user