cc_cmake_snapshot: drop Modules field

Use Modules_host, Modules_system or Modules_vendor instead

Also, fix test by adding libc++demangle to the ignored list.

Bug: 285204695
Test: m binder_sdk
Test: cd build/soong/cc && go test
Change-Id: I6c3eda83584bc910f8b73ffa0f36c3d7fce5f10b
This commit is contained in:
Tomasz Wasilczyk
2024-06-27 10:47:40 -07:00
parent b48f55eed5
commit bd83c74485
2 changed files with 6 additions and 7 deletions

View File

@@ -38,7 +38,9 @@ func TestEmptyCmakeSnapshot(t *testing.T) {
result := PrepareForIntegrationTestWithCc.RunTestWithBp(t, `
cc_cmake_snapshot {
name: "foo",
modules: [],
modules_host: [],
modules_system: [],
modules_vendor: [],
prebuilts: ["libc++"],
include_sources: true,
}`)
@@ -65,7 +67,7 @@ func TestCmakeSnapshotWithBinary(t *testing.T) {
result := android.GroupFixturePreparers(PrepareForIntegrationTestWithCc, xtra).RunTestWithBp(t, `
cc_cmake_snapshot {
name: "foo",
modules: [
modules_system: [
"foo_binary",
],
include_sources: true,
@@ -99,7 +101,7 @@ func TestCmakeSnapshotAsTestData(t *testing.T) {
cc_cmake_snapshot {
name: "foo",
modules: [],
modules_system: [],
prebuilts: ["libc++"],
include_sources: true,
}`)