Merge "Revert "Delete SyspropMutator""

This commit is contained in:
Silvia Vinyes
2022-09-14 14:00:10 +00:00
committed by Gerrit Code Review
5 changed files with 95 additions and 9 deletions

View File

@@ -365,10 +365,7 @@ func (m *syspropLibrary) ShouldSupportSdkVersion(ctx android.BaseModuleContext,
// sysprop_library creates schematized APIs from sysprop description files (.sysprop).
// Both Java and C++ modules can link against sysprop_library, and API stability check
// against latest APIs (see build/soong/scripts/freeze-sysprop-api-files.sh)
// is performed. Note that the generated C++ module has its name prefixed with
// `lib`, and it is this module that should be depended on from other C++
// modules; i.e., if the sysprop_library module is named `foo`, C++ modules
// should depend on `libfoo`.
// is performed.
func syspropLibraryFactory() android.Module {
m := &syspropLibrary{}

View File

@@ -209,32 +209,32 @@ func TestSyspropLibrary(t *testing.T) {
cc_library {
name: "cc-client-platform",
srcs: ["d.cpp"],
static_libs: ["libsysprop-platform"],
static_libs: ["sysprop-platform"],
}
cc_library_static {
name: "cc-client-platform-static",
srcs: ["d.cpp"],
whole_static_libs: ["libsysprop-platform"],
whole_static_libs: ["sysprop-platform"],
}
cc_library {
name: "cc-client-product",
srcs: ["d.cpp"],
product_specific: true,
static_libs: ["libsysprop-platform-on-product", "libsysprop-vendor-on-product"],
static_libs: ["sysprop-platform-on-product", "sysprop-vendor-on-product"],
}
cc_library {
name: "cc-client-vendor",
srcs: ["d.cpp"],
soc_specific: true,
static_libs: ["libsysprop-platform", "libsysprop-vendor"],
static_libs: ["sysprop-platform", "sysprop-vendor"],
}
cc_binary_host {
name: "hostbin",
static_libs: ["libsysprop-platform"],
static_libs: ["sysprop-platform"],
}
`)