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
diff --git a/cc/cmake_snapshot_test.go b/cc/cmake_snapshot_test.go
index 8fca6c1..b6f4369 100644
--- a/cc/cmake_snapshot_test.go
+++ b/cc/cmake_snapshot_test.go
@@ -38,7 +38,9 @@
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 @@
result := android.GroupFixturePreparers(PrepareForIntegrationTestWithCc, xtra).RunTestWithBp(t, `
cc_cmake_snapshot {
name: "foo",
- modules: [
+ modules_system: [
"foo_binary",
],
include_sources: true,
@@ -99,7 +101,7 @@
cc_cmake_snapshot {
name: "foo",
- modules: [],
+ modules_system: [],
prebuilts: ["libc++"],
include_sources: true,
}`)