5e914b286f
This fixes a bug that apex_available and min_sdk_version properties of a sysprop_library module are not forwarded to the generated cc or java modules. Bug: 181942475 Bug: 181940232 Test: m nothing Change-Id: I03bcb5836f080aecd452021a3ffe003f36eb652e
454 lines
13 KiB
Go
454 lines
13 KiB
Go
// Copyright (C) 2019 The Android Open Source Project
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package sysprop
|
|
|
|
import (
|
|
"reflect"
|
|
|
|
"android/soong/android"
|
|
"android/soong/cc"
|
|
"android/soong/java"
|
|
|
|
"io/ioutil"
|
|
"os"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/google/blueprint/proptools"
|
|
)
|
|
|
|
var buildDir string
|
|
|
|
func setUp() {
|
|
var err error
|
|
buildDir, err = ioutil.TempDir("", "soong_sysprop_test")
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
}
|
|
|
|
func tearDown() {
|
|
os.RemoveAll(buildDir)
|
|
}
|
|
|
|
func TestMain(m *testing.M) {
|
|
run := func() int {
|
|
setUp()
|
|
defer tearDown()
|
|
|
|
return m.Run()
|
|
}
|
|
|
|
os.Exit(run())
|
|
}
|
|
|
|
func testContext(config android.Config) *android.TestContext {
|
|
|
|
ctx := android.NewTestArchContext(config)
|
|
java.RegisterRequiredBuildComponentsForTest(ctx)
|
|
|
|
ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators)
|
|
|
|
android.RegisterPrebuiltMutators(ctx)
|
|
|
|
cc.RegisterRequiredBuildComponentsForTest(ctx)
|
|
|
|
ctx.RegisterModuleType("sysprop_library", syspropLibraryFactory)
|
|
|
|
ctx.Register()
|
|
|
|
return ctx
|
|
}
|
|
|
|
func run(t *testing.T, ctx *android.TestContext, config android.Config) {
|
|
t.Helper()
|
|
_, errs := ctx.ParseFileList(".", []string{"Android.bp"})
|
|
android.FailIfErrored(t, errs)
|
|
_, errs = ctx.PrepareBuildActions(config)
|
|
android.FailIfErrored(t, errs)
|
|
}
|
|
|
|
func testConfig(env map[string]string, bp string, fs map[string][]byte) android.Config {
|
|
bp += `
|
|
cc_library {
|
|
name: "libbase",
|
|
host_supported: true,
|
|
}
|
|
|
|
cc_library_headers {
|
|
name: "libbase_headers",
|
|
vendor_available: true,
|
|
recovery_available: true,
|
|
}
|
|
|
|
cc_library {
|
|
name: "liblog",
|
|
no_libcrt: true,
|
|
nocrt: true,
|
|
system_shared_libs: [],
|
|
recovery_available: true,
|
|
host_supported: true,
|
|
llndk_stubs: "liblog.llndk",
|
|
}
|
|
|
|
llndk_library {
|
|
name: "liblog.llndk",
|
|
symbol_file: "",
|
|
}
|
|
|
|
java_library {
|
|
name: "sysprop-library-stub-platform",
|
|
sdk_version: "core_current",
|
|
}
|
|
|
|
java_library {
|
|
name: "sysprop-library-stub-vendor",
|
|
soc_specific: true,
|
|
sdk_version: "core_current",
|
|
}
|
|
|
|
java_library {
|
|
name: "sysprop-library-stub-product",
|
|
product_specific: true,
|
|
sdk_version: "core_current",
|
|
}
|
|
`
|
|
|
|
bp += cc.GatherRequiredDepsForTest(android.Android)
|
|
|
|
mockFS := map[string][]byte{
|
|
"a.java": nil,
|
|
"b.java": nil,
|
|
"c.java": nil,
|
|
"d.cpp": nil,
|
|
"api/sysprop-platform-current.txt": nil,
|
|
"api/sysprop-platform-latest.txt": nil,
|
|
"api/sysprop-platform-on-product-current.txt": nil,
|
|
"api/sysprop-platform-on-product-latest.txt": nil,
|
|
"api/sysprop-vendor-current.txt": nil,
|
|
"api/sysprop-vendor-latest.txt": nil,
|
|
"api/sysprop-vendor-on-product-current.txt": nil,
|
|
"api/sysprop-vendor-on-product-latest.txt": nil,
|
|
"api/sysprop-odm-current.txt": nil,
|
|
"api/sysprop-odm-latest.txt": nil,
|
|
"framework/aidl/a.aidl": nil,
|
|
|
|
// For framework-res, which is an implicit dependency for framework
|
|
"AndroidManifest.xml": nil,
|
|
"build/make/target/product/security/testkey": nil,
|
|
|
|
"build/soong/scripts/jar-wrapper.sh": nil,
|
|
|
|
"build/make/core/proguard.flags": nil,
|
|
"build/make/core/proguard_basic_keeps.flags": nil,
|
|
|
|
"jdk8/jre/lib/jce.jar": nil,
|
|
"jdk8/jre/lib/rt.jar": nil,
|
|
"jdk8/lib/tools.jar": nil,
|
|
|
|
"bar-doc/a.java": nil,
|
|
"bar-doc/b.java": nil,
|
|
"bar-doc/IFoo.aidl": nil,
|
|
"bar-doc/known_oj_tags.txt": nil,
|
|
"external/doclava/templates-sdk": nil,
|
|
|
|
"cert/new_cert.x509.pem": nil,
|
|
"cert/new_cert.pk8": nil,
|
|
|
|
"android/sysprop/PlatformProperties.sysprop": nil,
|
|
"com/android/VendorProperties.sysprop": nil,
|
|
"com/android2/OdmProperties.sysprop": nil,
|
|
}
|
|
|
|
for k, v := range fs {
|
|
mockFS[k] = v
|
|
}
|
|
|
|
config := java.TestConfig(buildDir, env, bp, mockFS)
|
|
|
|
config.TestProductVariables.DeviceSystemSdkVersions = []string{"28"}
|
|
config.TestProductVariables.DeviceVndkVersion = proptools.StringPtr("current")
|
|
config.TestProductVariables.Platform_vndk_version = proptools.StringPtr("VER")
|
|
|
|
return config
|
|
|
|
}
|
|
|
|
func test(t *testing.T, bp string) *android.TestContext {
|
|
t.Helper()
|
|
config := testConfig(nil, bp, nil)
|
|
ctx := testContext(config)
|
|
run(t, ctx, config)
|
|
|
|
return ctx
|
|
}
|
|
|
|
func TestSyspropLibrary(t *testing.T) {
|
|
ctx := test(t, `
|
|
sysprop_library {
|
|
name: "sysprop-platform",
|
|
apex_available: ["//apex_available:platform"],
|
|
srcs: ["android/sysprop/PlatformProperties.sysprop"],
|
|
api_packages: ["android.sysprop"],
|
|
property_owner: "Platform",
|
|
vendor_available: true,
|
|
host_supported: true,
|
|
}
|
|
|
|
sysprop_library {
|
|
name: "sysprop-platform-on-product",
|
|
srcs: ["android/sysprop/PlatformProperties.sysprop"],
|
|
api_packages: ["android.sysprop"],
|
|
property_owner: "Platform",
|
|
product_specific: true,
|
|
}
|
|
|
|
sysprop_library {
|
|
name: "sysprop-vendor",
|
|
srcs: ["com/android/VendorProperties.sysprop"],
|
|
api_packages: ["com.android"],
|
|
property_owner: "Vendor",
|
|
vendor: true,
|
|
}
|
|
|
|
sysprop_library {
|
|
name: "sysprop-vendor-on-product",
|
|
srcs: ["com/android/VendorProperties.sysprop"],
|
|
api_packages: ["com.android"],
|
|
property_owner: "Vendor",
|
|
product_specific: true,
|
|
}
|
|
|
|
sysprop_library {
|
|
name: "sysprop-odm",
|
|
srcs: ["com/android2/OdmProperties.sysprop"],
|
|
api_packages: ["com.android2"],
|
|
property_owner: "Odm",
|
|
device_specific: true,
|
|
}
|
|
|
|
java_library {
|
|
name: "java-platform",
|
|
srcs: ["c.java"],
|
|
sdk_version: "system_current",
|
|
libs: ["sysprop-platform"],
|
|
}
|
|
|
|
java_library {
|
|
name: "java-platform-private",
|
|
srcs: ["c.java"],
|
|
platform_apis: true,
|
|
libs: ["sysprop-platform"],
|
|
}
|
|
|
|
java_library {
|
|
name: "java-product",
|
|
srcs: ["c.java"],
|
|
sdk_version: "system_current",
|
|
product_specific: true,
|
|
libs: ["sysprop-platform", "sysprop-vendor-on-product"],
|
|
}
|
|
|
|
java_library {
|
|
name: "java-vendor",
|
|
srcs: ["c.java"],
|
|
sdk_version: "system_current",
|
|
soc_specific: true,
|
|
libs: ["sysprop-platform", "sysprop-vendor"],
|
|
}
|
|
|
|
cc_library {
|
|
name: "cc-client-platform",
|
|
srcs: ["d.cpp"],
|
|
static_libs: ["sysprop-platform"],
|
|
}
|
|
|
|
cc_library_static {
|
|
name: "cc-client-platform-static",
|
|
srcs: ["d.cpp"],
|
|
whole_static_libs: ["sysprop-platform"],
|
|
}
|
|
|
|
cc_library {
|
|
name: "cc-client-product",
|
|
srcs: ["d.cpp"],
|
|
product_specific: true,
|
|
static_libs: ["sysprop-platform-on-product", "sysprop-vendor-on-product"],
|
|
}
|
|
|
|
cc_library {
|
|
name: "cc-client-vendor",
|
|
srcs: ["d.cpp"],
|
|
soc_specific: true,
|
|
static_libs: ["sysprop-platform", "sysprop-vendor"],
|
|
}
|
|
|
|
cc_binary_host {
|
|
name: "hostbin",
|
|
static_libs: ["sysprop-platform"],
|
|
}
|
|
`)
|
|
|
|
// Check for generated cc_library
|
|
for _, variant := range []string{
|
|
"android_vendor.VER_arm_armv7-a-neon_shared",
|
|
"android_vendor.VER_arm_armv7-a-neon_static",
|
|
"android_vendor.VER_arm64_armv8-a_shared",
|
|
"android_vendor.VER_arm64_armv8-a_static",
|
|
} {
|
|
ctx.ModuleForTests("libsysprop-platform", variant)
|
|
ctx.ModuleForTests("libsysprop-vendor", variant)
|
|
ctx.ModuleForTests("libsysprop-odm", variant)
|
|
}
|
|
|
|
for _, variant := range []string{
|
|
"android_arm_armv7-a-neon_shared",
|
|
"android_arm_armv7-a-neon_static",
|
|
"android_arm64_armv8-a_shared",
|
|
"android_arm64_armv8-a_static",
|
|
} {
|
|
library := ctx.ModuleForTests("libsysprop-platform", variant).Module().(*cc.Module)
|
|
expectedApexAvailableOnLibrary := []string{"//apex_available:platform"}
|
|
if !reflect.DeepEqual(library.ApexProperties.Apex_available, expectedApexAvailableOnLibrary) {
|
|
t.Errorf("apex available property on libsysprop-platform must be %#v, but was %#v.",
|
|
expectedApexAvailableOnLibrary, library.ApexProperties.Apex_available)
|
|
}
|
|
|
|
// product variant of vendor-owned sysprop_library
|
|
ctx.ModuleForTests("libsysprop-vendor-on-product", variant)
|
|
}
|
|
|
|
ctx.ModuleForTests("sysprop-platform", "android_common")
|
|
ctx.ModuleForTests("sysprop-platform_public", "android_common")
|
|
ctx.ModuleForTests("sysprop-vendor", "android_common")
|
|
ctx.ModuleForTests("sysprop-vendor-on-product", "android_common")
|
|
|
|
// Check for exported includes
|
|
coreVariant := "android_arm64_armv8-a_static"
|
|
vendorVariant := "android_vendor.VER_arm64_armv8-a_static"
|
|
|
|
platformInternalPath := "libsysprop-platform/android_arm64_armv8-a_static/gen/sysprop/include"
|
|
platformPublicCorePath := "libsysprop-platform/android_arm64_armv8-a_static/gen/sysprop/public/include"
|
|
platformPublicVendorPath := "libsysprop-platform/android_vendor.VER_arm64_armv8-a_static/gen/sysprop/public/include"
|
|
|
|
platformOnProductPath := "libsysprop-platform-on-product/android_arm64_armv8-a_static/gen/sysprop/public/include"
|
|
|
|
vendorInternalPath := "libsysprop-vendor/android_vendor.VER_arm64_armv8-a_static/gen/sysprop/include"
|
|
vendorPublicPath := "libsysprop-vendor-on-product/android_arm64_armv8-a_static/gen/sysprop/public/include"
|
|
|
|
platformClient := ctx.ModuleForTests("cc-client-platform", coreVariant)
|
|
platformFlags := platformClient.Rule("cc").Args["cFlags"]
|
|
|
|
// platform should use platform's internal header
|
|
if !strings.Contains(platformFlags, platformInternalPath) {
|
|
t.Errorf("flags for platform must contain %#v, but was %#v.",
|
|
platformInternalPath, platformFlags)
|
|
}
|
|
|
|
platformStaticClient := ctx.ModuleForTests("cc-client-platform-static", coreVariant)
|
|
platformStaticFlags := platformStaticClient.Rule("cc").Args["cFlags"]
|
|
|
|
// platform-static should use platform's internal header
|
|
if !strings.Contains(platformStaticFlags, platformInternalPath) {
|
|
t.Errorf("flags for platform-static must contain %#v, but was %#v.",
|
|
platformInternalPath, platformStaticFlags)
|
|
}
|
|
|
|
productClient := ctx.ModuleForTests("cc-client-product", coreVariant)
|
|
productFlags := productClient.Rule("cc").Args["cFlags"]
|
|
|
|
// Product should use platform's and vendor's public headers
|
|
if !strings.Contains(productFlags, platformOnProductPath) ||
|
|
!strings.Contains(productFlags, vendorPublicPath) {
|
|
t.Errorf("flags for product must contain %#v and %#v, but was %#v.",
|
|
platformPublicCorePath, vendorPublicPath, productFlags)
|
|
}
|
|
|
|
vendorClient := ctx.ModuleForTests("cc-client-vendor", vendorVariant)
|
|
vendorFlags := vendorClient.Rule("cc").Args["cFlags"]
|
|
|
|
// 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.",
|
|
platformPublicVendorPath, vendorInternalPath, vendorFlags)
|
|
}
|
|
|
|
// Java modules linking against system API should use public stub
|
|
javaSystemApiClient := ctx.ModuleForTests("java-platform", "android_common").Rule("javac")
|
|
syspropPlatformPublic := ctx.ModuleForTests("sysprop-platform_public", "android_common").Description("for turbine")
|
|
if g, w := javaSystemApiClient.Implicits.Strings(), syspropPlatformPublic.Output.String(); !android.InList(w, g) {
|
|
t.Errorf("system api client should use public stub %q, got %q", w, g)
|
|
}
|
|
}
|
|
|
|
func TestApexAvailabilityIsForwarded(t *testing.T) {
|
|
ctx := test(t, `
|
|
sysprop_library {
|
|
name: "sysprop-platform",
|
|
apex_available: ["//apex_available:platform"],
|
|
srcs: ["android/sysprop/PlatformProperties.sysprop"],
|
|
api_packages: ["android.sysprop"],
|
|
property_owner: "Platform",
|
|
}
|
|
`)
|
|
|
|
expected := []string{"//apex_available:platform"}
|
|
|
|
ccModule := ctx.ModuleForTests("libsysprop-platform", "android_arm64_armv8-a_shared").Module().(*cc.Module)
|
|
propFromCc := ccModule.ApexProperties.Apex_available
|
|
if !reflect.DeepEqual(propFromCc, expected) {
|
|
t.Errorf("apex_available not forwarded to cc module. expected %#v, got %#v",
|
|
expected, propFromCc)
|
|
}
|
|
|
|
javaModule := ctx.ModuleForTests("sysprop-platform", "android_common").Module().(*java.Library)
|
|
propFromJava := javaModule.ApexProperties.Apex_available
|
|
if !reflect.DeepEqual(propFromJava, expected) {
|
|
t.Errorf("apex_available not forwarded to java module. expected %#v, got %#v",
|
|
expected, propFromJava)
|
|
}
|
|
}
|
|
|
|
func TestMinSdkVersionIsForwarded(t *testing.T) {
|
|
ctx := test(t, `
|
|
sysprop_library {
|
|
name: "sysprop-platform",
|
|
srcs: ["android/sysprop/PlatformProperties.sysprop"],
|
|
api_packages: ["android.sysprop"],
|
|
property_owner: "Platform",
|
|
cpp: {
|
|
min_sdk_version: "29",
|
|
},
|
|
java: {
|
|
min_sdk_version: "30",
|
|
},
|
|
}
|
|
`)
|
|
|
|
ccModule := ctx.ModuleForTests("libsysprop-platform", "android_arm64_armv8-a_shared").Module().(*cc.Module)
|
|
propFromCc := proptools.String(ccModule.Properties.Min_sdk_version)
|
|
if propFromCc != "29" {
|
|
t.Errorf("min_sdk_version not forwarded to cc module. expected %#v, got %#v",
|
|
"29", propFromCc)
|
|
}
|
|
|
|
javaModule := ctx.ModuleForTests("sysprop-platform", "android_common").Module().(*java.Library)
|
|
propFromJava := javaModule.MinSdkVersion()
|
|
if propFromJava != "30" {
|
|
t.Errorf("min_sdk_version not forwarded to java module. expected %#v, got %#v",
|
|
"30", propFromJava)
|
|
}
|
|
}
|