diff options
| author | Inseob Kim <inseob@google.com> | 2019-06-08 20:36:59 +0900 |
|---|---|---|
| committer | Inseob Kim <inseob@google.com> | 2019-06-11 23:31:32 +0900 |
| commit | 5cefbd289d979c6b73e1d06a477d952cda08bb6d (patch) | |
| tree | 5370fb3d7358f484e2581897657a994bd112acc4 /sysprop | |
| parent | b879fb6b4b9d3f231503d15878835d9acdd0744e (diff) | |
| download | build_soong-5cefbd289d979c6b73e1d06a477d952cda08bb6d.tar.gz build_soong-5cefbd289d979c6b73e1d06a477d952cda08bb6d.tar.bz2 build_soong-5cefbd289d979c6b73e1d06a477d952cda08bb6d.zip | |
sysprop_library: Rename system scope to public
In the first design, public sysprops have been accessible from Java
modules linking against SDK. But SDK modules shouldn't do, because
sysprop_library isn't for the apps. This renames system to public, so
that only public(System till now) and internal scopes remain from now.
Bug: 131637873
Test: m && sysprop_test
Change-Id: I548007d4a6018922f98d3d13915cee1d66070086
Diffstat (limited to 'sysprop')
| -rw-r--r-- | sysprop/sysprop_test.go | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sysprop/sysprop_test.go b/sysprop/sysprop_test.go index b470ba53..0566036a 100644 --- a/sysprop/sysprop_test.go +++ b/sysprop/sysprop_test.go @@ -313,13 +313,13 @@ func TestSyspropLibrary(t *testing.T) { vendorVariant := "android_arm64_armv8-a_vendor_static" platformInternalPath := "libsysprop-platform/android_arm64_armv8-a_core_static/gen/sysprop/include" - platformSystemCorePath := "libsysprop-platform/android_arm64_armv8-a_core_static/gen/sysprop/system/include" - platformSystemVendorPath := "libsysprop-platform/android_arm64_armv8-a_vendor_static/gen/sysprop/system/include" + platformPublicCorePath := "libsysprop-platform/android_arm64_armv8-a_core_static/gen/sysprop/public/include" + platformPublicVendorPath := "libsysprop-platform/android_arm64_armv8-a_vendor_static/gen/sysprop/public/include" - platformOnProductPath := "libsysprop-platform-on-product/android_arm64_armv8-a_core_static/gen/sysprop/system/include" + platformOnProductPath := "libsysprop-platform-on-product/android_arm64_armv8-a_core_static/gen/sysprop/public/include" vendorInternalPath := "libsysprop-vendor/android_arm64_armv8-a_vendor_static/gen/sysprop/include" - vendorSystemPath := "libsysprop-vendor/android_arm64_armv8-a_core_static/gen/sysprop/system/include" + vendorPublicPath := "libsysprop-vendor/android_arm64_armv8-a_core_static/gen/sysprop/public/include" platformClient := ctx.ModuleForTests("cc-client-platform", coreVariant) platformFlags := platformClient.Rule("cc").Args["cFlags"] @@ -342,20 +342,20 @@ func TestSyspropLibrary(t *testing.T) { productClient := ctx.ModuleForTests("cc-client-product", coreVariant) productFlags := productClient.Rule("cc").Args["cFlags"] - // Product should use platform's and vendor's system headers + // Product should use platform's and vendor's public headers if !strings.Contains(productFlags, platformOnProductPath) || - !strings.Contains(productFlags, vendorSystemPath) { + !strings.Contains(productFlags, vendorPublicPath) { t.Errorf("flags for product must contain %#v and %#v, but was %#v.", - platformSystemCorePath, vendorSystemPath, productFlags) + platformPublicCorePath, vendorPublicPath, productFlags) } vendorClient := ctx.ModuleForTests("cc-client-vendor", vendorVariant) vendorFlags := vendorClient.Rule("cc").Args["cFlags"] - // Vendor should use platform's system header and vendor's internal header - if !strings.Contains(vendorFlags, platformSystemVendorPath) || + // Vendor should use platform's public header and vendor's internal header + if !strings.Contains(vendorFlags, platformPublicVendorPath) || !strings.Contains(vendorFlags, vendorInternalPath) { t.Errorf("flags for vendor must contain %#v and %#v, but was %#v.", - platformSystemVendorPath, vendorInternalPath, vendorFlags) + platformPublicVendorPath, vendorInternalPath, vendorFlags) } } |