StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Soong: remove obsolete proto lib from unit test" into main am: 54082dd8fe am: efc53b111d

Browse Source 
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:
Dennis Shen
2024-05-23 16:35:43 +00:00
committed by Automerger Merge Worker
parent 82bdeba837 efc53b111d
commit a6efbada57
3 changed files with 1 additions and 33 deletions
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

@@ -10717,10 +10717,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")