From 5cefbd289d979c6b73e1d06a477d952cda08bb6d Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Sat, 8 Jun 2019 20:36:59 +0900 Subject: [PATCH] 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 --- cc/gen.go | 8 ++++---- cc/library.go | 6 +++--- sysprop/sysprop_test.go | 20 ++++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cc/gen.go b/cc/gen.go index ae761d036..57eb9296f 100644 --- a/cc/gen.go +++ b/cc/gen.go @@ -47,11 +47,11 @@ var ( sysprop = pctx.AndroidStaticRule("sysprop", blueprint.RuleParams{ - Command: "$syspropCmd --header-dir=$headerOutDir --system-header-dir=$systemOutDir " + + Command: "$syspropCmd --header-dir=$headerOutDir --public-header-dir=$publicOutDir " + "--source-dir=$srcOutDir --include-name=$includeName $in", CommandDeps: []string{"$syspropCmd"}, }, - "headerOutDir", "systemOutDir", "srcOutDir", "includeName") + "headerOutDir", "publicOutDir", "srcOutDir", "includeName") windmc = pctx.AndroidStaticRule("windmc", blueprint.RuleParams{ @@ -141,7 +141,7 @@ func genLex(ctx android.ModuleContext, lexFile android.Path, outFile android.Mod func genSysprop(ctx android.ModuleContext, syspropFile android.Path) (android.Path, android.Path) { headerFile := android.PathForModuleGen(ctx, "sysprop", "include", syspropFile.Rel()+".h") - systemHeaderFile := android.PathForModuleGen(ctx, "sysprop/system", "include", syspropFile.Rel()+".h") + publicHeaderFile := android.PathForModuleGen(ctx, "sysprop/public", "include", syspropFile.Rel()+".h") cppFile := android.PathForModuleGen(ctx, "sysprop", syspropFile.Rel()+".cpp") ctx.Build(pctx, android.BuildParams{ @@ -152,7 +152,7 @@ func genSysprop(ctx android.ModuleContext, syspropFile android.Path) (android.Pa Input: syspropFile, Args: map[string]string{ "headerOutDir": filepath.Dir(headerFile.String()), - "systemOutDir": filepath.Dir(systemHeaderFile.String()), + "publicOutDir": filepath.Dir(publicHeaderFile.String()), "srcOutDir": filepath.Dir(cppFile.String()), "includeName": syspropFile.Rel() + ".h", }, diff --git a/cc/library.go b/cc/library.go index 725208ac3..be5661c79 100644 --- a/cc/library.go +++ b/cc/library.go @@ -882,10 +882,10 @@ func (library *libraryDecorator) link(ctx ModuleContext, isVendor := ctx.useVndk() isOwnerPlatform := Bool(library.Properties.Sysprop.Platform) - useSystem := isProduct || (isOwnerPlatform == isVendor) + usePublic := isProduct || (isOwnerPlatform == isVendor) - if useSystem { - dir = android.PathForModuleGen(ctx, "sysprop/system", "include").String() + if usePublic { + dir = android.PathForModuleGen(ctx, "sysprop/public", "include").String() } } diff --git a/sysprop/sysprop_test.go b/sysprop/sysprop_test.go index b470ba531..0566036a2 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) } }