Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
// 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 sdk
|
|
|
|
|
|
|
|
import (
|
2019-10-11 13:59:13 +08:00
|
|
|
"fmt"
|
2019-11-22 22:52:29 +08:00
|
|
|
"io"
|
2019-12-13 19:22:16 +08:00
|
|
|
"reflect"
|
2019-10-11 13:59:13 +08:00
|
|
|
"strconv"
|
|
|
|
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
"github.com/google/blueprint"
|
2019-11-06 15:03:32 +08:00
|
|
|
"github.com/google/blueprint/proptools"
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
|
|
|
|
"android/soong/android"
|
|
|
|
// This package doesn't depend on the apex package, but import it to make its mutators to be
|
|
|
|
// registered before mutators in this package. See RegisterPostDepsMutators for more details.
|
|
|
|
_ "android/soong/apex"
|
|
|
|
)
|
|
|
|
|
|
|
|
func init() {
|
2019-11-04 11:23:40 +08:00
|
|
|
pctx.Import("android/soong/android")
|
2019-11-30 04:17:53 +08:00
|
|
|
pctx.Import("android/soong/java/config")
|
|
|
|
|
2021-03-10 06:59:28 +08:00
|
|
|
registerSdkBuildComponents(android.InitRegistrationContext)
|
|
|
|
}
|
|
|
|
|
|
|
|
func registerSdkBuildComponents(ctx android.RegistrationContext) {
|
|
|
|
ctx.RegisterModuleType("sdk", SdkModuleFactory)
|
|
|
|
ctx.RegisterModuleType("sdk_snapshot", SnapshotModuleFactory)
|
|
|
|
ctx.PreDepsMutators(RegisterPreDepsMutators)
|
|
|
|
ctx.PostDepsMutators(RegisterPostDepsMutators)
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
type sdk struct {
|
|
|
|
android.ModuleBase
|
|
|
|
android.DefaultableModuleBase
|
|
|
|
|
2019-12-13 19:22:16 +08:00
|
|
|
// The dynamically generated information about the registered SdkMemberType
|
|
|
|
dynamicSdkMemberTypes *dynamicSdkMemberTypes
|
|
|
|
|
|
|
|
// The dynamically created instance of the properties struct containing the sdk member
|
|
|
|
// list properties, e.g. java_libs.
|
|
|
|
dynamicMemberTypeListProperties interface{}
|
|
|
|
|
2020-02-26 03:26:33 +08:00
|
|
|
// Information about the OsType specific member variants associated with this variant.
|
|
|
|
//
|
2020-03-21 01:50:07 +08:00
|
|
|
// Set by OsType specific variants in the collectMembers() method and used by the
|
|
|
|
// CommonOS variant when building the snapshot. That work is all done on separate
|
|
|
|
// calls to the sdk.GenerateAndroidBuildActions method which is guaranteed to be
|
|
|
|
// called for the OsType specific variants before the CommonOS variant (because
|
|
|
|
// the latter depends on the former).
|
2020-02-26 03:26:33 +08:00
|
|
|
memberRefs []sdkMemberRef
|
|
|
|
|
2020-03-21 01:50:07 +08:00
|
|
|
// The multilib variants that are used by this sdk variant.
|
|
|
|
multilibUsages multilibUsage
|
|
|
|
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
properties sdkProperties
|
2019-10-11 13:59:13 +08:00
|
|
|
|
2019-11-04 11:23:40 +08:00
|
|
|
snapshotFile android.OptionalPath
|
2019-11-27 02:02:20 +08:00
|
|
|
|
|
|
|
// The builder, preserved for testing.
|
|
|
|
builderForTests *snapshotBuilder
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
type sdkProperties struct {
|
2019-10-11 13:59:13 +08:00
|
|
|
Snapshot bool `blueprint:"mutated"`
|
2019-12-17 01:21:27 +08:00
|
|
|
|
|
|
|
// True if this is a module_exports (or module_exports_snapshot) module type.
|
|
|
|
Module_exports bool `blueprint:"mutated"`
|
2020-09-29 23:01:08 +08:00
|
|
|
|
|
|
|
// The additional visibility to add to the prebuilt modules to allow them to
|
|
|
|
// reference each other.
|
|
|
|
//
|
|
|
|
// This can only be used to widen the visibility of the members:
|
|
|
|
//
|
|
|
|
// * Specifying //visibility:public here will make all members visible and
|
|
|
|
// essentially ignore their own visibility.
|
|
|
|
// * Specifying //visibility:private here is an error.
|
|
|
|
// * Specifying any other rule here will add it to the members visibility and
|
|
|
|
// be output to the member prebuilt in the snapshot. Duplicates will be
|
|
|
|
// dropped. Adding a rule to members that have //visibility:private will
|
|
|
|
// cause the //visibility:private to be discarded.
|
|
|
|
Prebuilt_visibility []string
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
}
|
|
|
|
|
2019-11-28 22:31:38 +08:00
|
|
|
// Contains information about the sdk properties that list sdk members, e.g.
|
2019-12-05 19:25:53 +08:00
|
|
|
// Java_header_libs.
|
2019-11-28 22:31:38 +08:00
|
|
|
type sdkMemberListProperty struct {
|
|
|
|
// getter for the list of member names
|
2019-12-13 19:22:16 +08:00
|
|
|
getter func(properties interface{}) []string
|
2019-11-28 22:31:38 +08:00
|
|
|
|
|
|
|
// the type of member referenced in the list
|
|
|
|
memberType android.SdkMemberType
|
|
|
|
|
2019-12-13 19:22:16 +08:00
|
|
|
// the dependency tag used for items in this list that can be used to determine the memberType
|
|
|
|
// for a resolved dependency.
|
2019-11-20 03:44:10 +08:00
|
|
|
dependencyTag android.SdkMemberTypeDependencyTag
|
2019-11-28 22:31:38 +08:00
|
|
|
}
|
|
|
|
|
2019-12-13 19:22:16 +08:00
|
|
|
func (p *sdkMemberListProperty) propertyName() string {
|
|
|
|
return p.memberType.SdkPropertyName()
|
|
|
|
}
|
|
|
|
|
|
|
|
// Cache of dynamically generated dynamicSdkMemberTypes objects. The key is the pointer
|
|
|
|
// to a slice of SdkMemberType instances held in android.SdkMemberTypes.
|
|
|
|
var dynamicSdkMemberTypesMap android.OncePer
|
|
|
|
|
|
|
|
// A dynamically generated set of member list properties and associated structure type.
|
|
|
|
type dynamicSdkMemberTypes struct {
|
|
|
|
// The dynamically generated structure type.
|
|
|
|
//
|
|
|
|
// Contains one []string exported field for each android.SdkMemberTypes. The name of the field
|
|
|
|
// is the exported form of the value returned by SdkMemberType.SdkPropertyName().
|
|
|
|
propertiesStructType reflect.Type
|
|
|
|
|
|
|
|
// Information about each of the member type specific list properties.
|
|
|
|
memberListProperties []*sdkMemberListProperty
|
|
|
|
}
|
|
|
|
|
|
|
|
func (d *dynamicSdkMemberTypes) createMemberListProperties() interface{} {
|
|
|
|
return reflect.New(d.propertiesStructType).Interface()
|
|
|
|
}
|
|
|
|
|
|
|
|
func getDynamicSdkMemberTypes(registry *android.SdkMemberTypesRegistry) *dynamicSdkMemberTypes {
|
|
|
|
|
|
|
|
// Get a key that uniquely identifies the registry contents.
|
|
|
|
key := registry.UniqueOnceKey()
|
|
|
|
|
|
|
|
// Get the registered types.
|
|
|
|
registeredTypes := registry.RegisteredTypes()
|
|
|
|
|
|
|
|
// Get the cached value, creating new instance if necessary.
|
|
|
|
return dynamicSdkMemberTypesMap.Once(key, func() interface{} {
|
|
|
|
return createDynamicSdkMemberTypes(registeredTypes)
|
|
|
|
}).(*dynamicSdkMemberTypes)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create the dynamicSdkMemberTypes from the list of registered member types.
|
2019-11-29 19:55:51 +08:00
|
|
|
//
|
2019-12-13 19:22:16 +08:00
|
|
|
// A struct is created which contains one exported field per member type corresponding to
|
|
|
|
// the SdkMemberType.SdkPropertyName() value.
|
|
|
|
//
|
|
|
|
// A list of sdkMemberListProperty instances is created, one per member type that provides:
|
|
|
|
// * a reference to the member type.
|
|
|
|
// * a getter for the corresponding field in the properties struct.
|
|
|
|
// * a dependency tag that identifies the member type of a resolved dependency.
|
|
|
|
//
|
|
|
|
func createDynamicSdkMemberTypes(sdkMemberTypes []android.SdkMemberType) *dynamicSdkMemberTypes {
|
2019-12-17 01:43:48 +08:00
|
|
|
|
2019-12-13 19:22:16 +08:00
|
|
|
var listProperties []*sdkMemberListProperty
|
|
|
|
var fields []reflect.StructField
|
|
|
|
|
|
|
|
// Iterate over the member types creating StructField and sdkMemberListProperty objects.
|
|
|
|
for f, memberType := range sdkMemberTypes {
|
|
|
|
p := memberType.SdkPropertyName()
|
|
|
|
|
|
|
|
// Create a dynamic exported field for the member type's property.
|
|
|
|
fields = append(fields, reflect.StructField{
|
|
|
|
Name: proptools.FieldNameForProperty(p),
|
|
|
|
Type: reflect.TypeOf([]string{}),
|
2020-03-03 02:38:15 +08:00
|
|
|
Tag: `android:"arch_variant"`,
|
2019-12-13 19:22:16 +08:00
|
|
|
})
|
|
|
|
|
|
|
|
// Copy the field index for use in the getter func as using the loop variable directly will
|
|
|
|
// cause all funcs to use the last value.
|
|
|
|
fieldIndex := f
|
|
|
|
|
|
|
|
// Create an sdkMemberListProperty for the member type.
|
|
|
|
memberListProperty := &sdkMemberListProperty{
|
|
|
|
getter: func(properties interface{}) []string {
|
|
|
|
// The properties is expected to be of the following form (where
|
|
|
|
// <Module_types> is the name of an SdkMemberType.SdkPropertyName().
|
|
|
|
// properties *struct {<Module_types> []string, ....}
|
|
|
|
//
|
|
|
|
// Although it accesses the field by index the following reflection code is equivalent to:
|
|
|
|
// *properties.<Module_types>
|
|
|
|
//
|
|
|
|
list := reflect.ValueOf(properties).Elem().Field(fieldIndex).Interface().([]string)
|
|
|
|
return list
|
|
|
|
},
|
|
|
|
|
|
|
|
memberType: memberType,
|
|
|
|
|
2019-11-20 03:44:10 +08:00
|
|
|
dependencyTag: android.DependencyTagForSdkMemberType(memberType),
|
2019-12-13 19:22:16 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
listProperties = append(listProperties, memberListProperty)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create a dynamic struct from the collated fields.
|
|
|
|
propertiesStructType := reflect.StructOf(fields)
|
|
|
|
|
|
|
|
return &dynamicSdkMemberTypes{
|
|
|
|
memberListProperties: listProperties,
|
|
|
|
propertiesStructType: propertiesStructType,
|
|
|
|
}
|
2019-11-28 22:31:38 +08:00
|
|
|
}
|
|
|
|
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
// sdk defines an SDK which is a logical group of modules (e.g. native libs, headers, java libs, etc.)
|
|
|
|
// which Mainline modules like APEX can choose to build with.
|
2019-12-17 01:21:27 +08:00
|
|
|
func SdkModuleFactory() android.Module {
|
2019-12-17 01:43:48 +08:00
|
|
|
return newSdkModule(false)
|
2019-12-17 01:21:27 +08:00
|
|
|
}
|
2019-12-13 19:22:16 +08:00
|
|
|
|
2019-12-17 01:43:48 +08:00
|
|
|
func newSdkModule(moduleExports bool) *sdk {
|
2019-12-17 01:21:27 +08:00
|
|
|
s := &sdk{}
|
2019-12-17 01:43:48 +08:00
|
|
|
s.properties.Module_exports = moduleExports
|
2019-12-13 19:22:16 +08:00
|
|
|
// Get the dynamic sdk member type data for the currently registered sdk member types.
|
2019-12-17 01:43:48 +08:00
|
|
|
var registry *android.SdkMemberTypesRegistry
|
|
|
|
if moduleExports {
|
|
|
|
registry = android.ModuleExportsMemberTypes
|
|
|
|
} else {
|
|
|
|
registry = android.SdkMemberTypes
|
|
|
|
}
|
|
|
|
s.dynamicSdkMemberTypes = getDynamicSdkMemberTypes(registry)
|
2019-12-13 19:22:16 +08:00
|
|
|
// Create an instance of the dynamically created struct that contains all the
|
|
|
|
// properties for the member type specific list properties.
|
|
|
|
s.dynamicMemberTypeListProperties = s.dynamicSdkMemberTypes.createMemberListProperties()
|
|
|
|
s.AddProperties(&s.properties, s.dynamicMemberTypeListProperties)
|
2020-09-29 23:01:08 +08:00
|
|
|
|
|
|
|
// Make sure that the prebuilt visibility property is verified for errors.
|
|
|
|
android.AddVisibilityProperty(s, "prebuilt_visibility", &s.properties.Prebuilt_visibility)
|
2020-02-26 03:26:33 +08:00
|
|
|
android.InitCommonOSAndroidMultiTargetsArchModule(s, android.HostAndDeviceSupported, android.MultilibCommon)
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
android.InitDefaultableModule(s)
|
2019-11-06 15:03:32 +08:00
|
|
|
android.AddLoadHook(s, func(ctx android.LoadHookContext) {
|
|
|
|
type props struct {
|
|
|
|
Compile_multilib *string
|
|
|
|
}
|
|
|
|
p := &props{Compile_multilib: proptools.StringPtr("both")}
|
2020-07-01 03:34:00 +08:00
|
|
|
ctx.PrependProperties(p)
|
2019-11-06 15:03:32 +08:00
|
|
|
})
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
return s
|
|
|
|
}
|
|
|
|
|
2019-10-11 13:59:13 +08:00
|
|
|
// sdk_snapshot is a versioned snapshot of an SDK. This is an auto-generated module.
|
|
|
|
func SnapshotModuleFactory() android.Module {
|
2019-12-17 01:43:48 +08:00
|
|
|
s := newSdkModule(false)
|
2019-12-17 01:21:27 +08:00
|
|
|
s.properties.Snapshot = true
|
2019-10-11 13:59:13 +08:00
|
|
|
return s
|
|
|
|
}
|
|
|
|
|
2020-01-21 02:16:30 +08:00
|
|
|
func (s *sdk) memberListProperties() []*sdkMemberListProperty {
|
|
|
|
return s.dynamicSdkMemberTypes.memberListProperties
|
|
|
|
}
|
|
|
|
|
|
|
|
func (s *sdk) getExportedMembers() map[string]struct{} {
|
2020-03-06 20:30:43 +08:00
|
|
|
// Collect all the exported members.
|
|
|
|
exportedMembers := make(map[string]struct{})
|
2020-01-21 02:16:30 +08:00
|
|
|
|
2020-03-06 20:30:43 +08:00
|
|
|
for _, memberListProperty := range s.memberListProperties() {
|
|
|
|
names := memberListProperty.getter(s.dynamicMemberTypeListProperties)
|
2020-01-21 02:16:30 +08:00
|
|
|
|
2020-03-06 20:30:43 +08:00
|
|
|
// Every member specified explicitly in the properties is exported by the sdk.
|
|
|
|
for _, name := range names {
|
|
|
|
exportedMembers[name] = struct{}{}
|
2020-01-21 02:16:30 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-06 20:30:43 +08:00
|
|
|
return exportedMembers
|
2020-01-21 02:16:30 +08:00
|
|
|
}
|
|
|
|
|
2019-10-11 13:59:13 +08:00
|
|
|
func (s *sdk) snapshot() bool {
|
|
|
|
return s.properties.Snapshot
|
|
|
|
}
|
|
|
|
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
func (s *sdk) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
2020-02-26 03:26:33 +08:00
|
|
|
if s.snapshot() {
|
2019-11-04 11:23:40 +08:00
|
|
|
// We don't need to create a snapshot out of sdk_snapshot.
|
|
|
|
// That doesn't make sense. We need a snapshot to create sdk_snapshot.
|
2020-02-26 03:26:33 +08:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
// This method is guaranteed to be called on OsType specific variants before it is called
|
|
|
|
// on their corresponding CommonOS variant.
|
|
|
|
if !s.IsCommonOSVariant() {
|
2020-03-21 01:50:07 +08:00
|
|
|
// Update the OsType specific sdk variant with information about its members.
|
|
|
|
s.collectMembers(ctx)
|
2020-02-26 03:26:33 +08:00
|
|
|
} else {
|
|
|
|
// Get the OsType specific variants on which the CommonOS depends.
|
|
|
|
osSpecificVariants := android.GetOsSpecificVariantsOfCommonOSVariant(ctx)
|
|
|
|
var sdkVariants []*sdk
|
|
|
|
for _, m := range osSpecificVariants {
|
|
|
|
if sdkVariant, ok := m.(*sdk); ok {
|
|
|
|
sdkVariants = append(sdkVariants, sdkVariant)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Generate the snapshot from the member info.
|
2020-02-27 21:45:35 +08:00
|
|
|
p := s.buildSnapshot(ctx, sdkVariants)
|
|
|
|
s.snapshotFile = android.OptionalPathForPath(p)
|
|
|
|
ctx.InstallFile(android.PathForMainlineSdksInstall(ctx), s.Name()+"-current.zip", p)
|
2019-11-04 11:23:40 +08:00
|
|
|
}
|
2019-10-11 13:59:13 +08:00
|
|
|
}
|
|
|
|
|
2019-12-03 12:24:29 +08:00
|
|
|
func (s *sdk) AndroidMkEntries() []android.AndroidMkEntries {
|
2019-11-04 11:23:40 +08:00
|
|
|
if !s.snapshotFile.Valid() {
|
2019-12-03 12:24:29 +08:00
|
|
|
return []android.AndroidMkEntries{}
|
2019-11-04 11:23:40 +08:00
|
|
|
}
|
|
|
|
|
2019-12-03 12:24:29 +08:00
|
|
|
return []android.AndroidMkEntries{android.AndroidMkEntries{
|
2019-11-04 11:23:40 +08:00
|
|
|
Class: "FAKE",
|
|
|
|
OutputFile: s.snapshotFile,
|
2020-06-15 13:24:19 +08:00
|
|
|
DistFiles: android.MakeDefaultDistFiles(s.snapshotFile.Path()),
|
2019-11-04 11:23:40 +08:00
|
|
|
Include: "$(BUILD_PHONY_PACKAGE)",
|
2019-11-22 22:52:29 +08:00
|
|
|
ExtraFooters: []android.AndroidMkExtraFootersFunc{
|
2020-12-08 02:23:54 +08:00
|
|
|
func(w io.Writer, name, prefix, moduleDir string) {
|
2019-11-22 22:52:29 +08:00
|
|
|
// Allow the sdk to be built by simply passing its name on the command line.
|
|
|
|
fmt.Fprintln(w, ".PHONY:", s.Name())
|
|
|
|
fmt.Fprintln(w, s.Name()+":", s.snapshotFile.String())
|
|
|
|
},
|
|
|
|
},
|
2019-12-03 12:24:29 +08:00
|
|
|
}}
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// RegisterPreDepsMutators registers pre-deps mutators to support modules implementing SdkAware
|
|
|
|
// interface and the sdk module type. This function has been made public to be called by tests
|
|
|
|
// outside of the sdk package
|
|
|
|
func RegisterPreDepsMutators(ctx android.RegisterMutatorsContext) {
|
|
|
|
ctx.BottomUp("SdkMember", memberMutator).Parallel()
|
|
|
|
ctx.TopDown("SdkMember_deps", memberDepsMutator).Parallel()
|
|
|
|
ctx.BottomUp("SdkMemberInterVersion", memberInterVersionMutator).Parallel()
|
|
|
|
}
|
|
|
|
|
2020-03-31 22:23:40 +08:00
|
|
|
// RegisterPostDepsMutators registers post-deps mutators to support modules implementing SdkAware
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
// interface and the sdk module type. This function has been made public to be called by tests
|
|
|
|
// outside of the sdk package
|
|
|
|
func RegisterPostDepsMutators(ctx android.RegisterMutatorsContext) {
|
|
|
|
// These must run AFTER apexMutator. Note that the apex package is imported even though there is
|
|
|
|
// no direct dependency to the package here. sdkDepsMutator sets the SDK requirements from an
|
|
|
|
// APEX to its dependents. Since different versions of the same SDK can be used by different
|
|
|
|
// APEXes, the apex and its dependents (which includes the dependencies to the sdk members)
|
|
|
|
// should have been mutated for the apex before the SDK requirements are set.
|
|
|
|
ctx.TopDown("SdkDepsMutator", sdkDepsMutator).Parallel()
|
|
|
|
ctx.BottomUp("SdkDepsReplaceMutator", sdkDepsReplaceMutator).Parallel()
|
2019-10-15 14:20:07 +08:00
|
|
|
ctx.TopDown("SdkRequirementCheck", sdkRequirementsMutator).Parallel()
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
type dependencyTag struct {
|
|
|
|
blueprint.BaseDependencyTag
|
|
|
|
}
|
|
|
|
|
2020-07-07 10:22:21 +08:00
|
|
|
// Mark this tag so dependencies that use it are excluded from APEX contents.
|
|
|
|
func (t dependencyTag) ExcludeFromApexContents() {}
|
|
|
|
|
|
|
|
var _ android.ExcludeFromApexContentsTag = dependencyTag{}
|
|
|
|
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
// For dependencies from an in-development version of an SDK member to frozen versions of the same member
|
|
|
|
// e.g. libfoo -> libfoo.mysdk.11 and libfoo.mysdk.12
|
2021-03-17 21:25:29 +08:00
|
|
|
//
|
|
|
|
// The dependency represented by this tag requires that for every APEX variant created for the
|
|
|
|
// `from` module that an equivalent APEX variant is created for the 'to' module. This is because an
|
|
|
|
// APEX that requires a specific version of an sdk (via the `uses_sdks` property will replace
|
|
|
|
// dependencies on the unversioned sdk member with a dependency on the appropriate versioned sdk
|
|
|
|
// member. In order for that to work the versioned sdk member needs to have a variant for that APEX.
|
|
|
|
// As it is not known at the time that the APEX variants are created which specific APEX variants of
|
|
|
|
// a versioned sdk members will be required it is necessary for the versioned sdk members to have
|
|
|
|
// variants for any APEX that it could be used within.
|
|
|
|
//
|
|
|
|
// If the APEX selects a versioned sdk member then it will not have a dependency on the `from`
|
|
|
|
// module at all so any dependencies of that module will not affect the APEX. However, if the APEX
|
|
|
|
// selects the unversioned sdk member then it must exclude all the versioned sdk members. In no
|
|
|
|
// situation would this dependency cause the `to` module to be added to the APEX hence why this tag
|
|
|
|
// also excludes the `to` module from being added to the APEX contents.
|
2020-01-14 22:06:09 +08:00
|
|
|
type sdkMemberVersionedDepTag struct {
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
dependencyTag
|
|
|
|
member string
|
|
|
|
version string
|
|
|
|
}
|
|
|
|
|
2021-03-17 21:25:29 +08:00
|
|
|
func (t sdkMemberVersionedDepTag) AlwaysRequireApexVariant() bool {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
2020-01-14 22:06:09 +08:00
|
|
|
// Mark this tag so dependencies that use it are excluded from visibility enforcement.
|
|
|
|
func (t sdkMemberVersionedDepTag) ExcludeFromVisibilityEnforcement() {}
|
|
|
|
|
2021-03-17 21:25:29 +08:00
|
|
|
var _ android.AlwaysRequireApexVariantTag = sdkMemberVersionedDepTag{}
|
|
|
|
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
// Step 1: create dependencies from an SDK module to its members.
|
|
|
|
func memberMutator(mctx android.BottomUpMutatorContext) {
|
2019-12-13 19:22:16 +08:00
|
|
|
if s, ok := mctx.Module().(*sdk); ok {
|
2020-02-26 03:26:33 +08:00
|
|
|
// Add dependencies from enabled and non CommonOS variants to the sdk member variants.
|
|
|
|
if s.Enabled() && !s.IsCommonOSVariant() {
|
2020-02-20 21:39:41 +08:00
|
|
|
for _, memberListProperty := range s.memberListProperties() {
|
|
|
|
names := memberListProperty.getter(s.dynamicMemberTypeListProperties)
|
2020-02-27 21:29:56 +08:00
|
|
|
if len(names) > 0 {
|
|
|
|
tag := memberListProperty.dependencyTag
|
|
|
|
memberListProperty.memberType.AddDependencies(mctx, tag, names)
|
|
|
|
}
|
2020-02-20 21:39:41 +08:00
|
|
|
}
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Step 2: record that dependencies of SDK modules are members of the SDK modules
|
|
|
|
func memberDepsMutator(mctx android.TopDownMutatorContext) {
|
2019-10-11 13:59:13 +08:00
|
|
|
if s, ok := mctx.Module().(*sdk); ok {
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
mySdkRef := android.ParseSdkRef(mctx, mctx.ModuleName(), "name")
|
2019-10-11 13:59:13 +08:00
|
|
|
if s.snapshot() && mySdkRef.Unversioned() {
|
|
|
|
mctx.PropertyErrorf("name", "sdk_snapshot should be named as <name>@<version>. "+
|
|
|
|
"Did you manually modify Android.bp?")
|
|
|
|
}
|
|
|
|
if !s.snapshot() && !mySdkRef.Unversioned() {
|
|
|
|
mctx.PropertyErrorf("name", "sdk shouldn't be named as <name>@<version>.")
|
|
|
|
}
|
|
|
|
if mySdkRef.Version != "" && mySdkRef.Version != "current" {
|
|
|
|
if _, err := strconv.Atoi(mySdkRef.Version); err != nil {
|
|
|
|
mctx.PropertyErrorf("name", "version %q is neither a number nor \"current\"", mySdkRef.Version)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
mctx.VisitDirectDeps(func(child android.Module) {
|
|
|
|
if member, ok := child.(android.SdkAware); ok {
|
|
|
|
member.MakeMemberOf(mySdkRef)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-10-11 13:59:13 +08:00
|
|
|
// Step 3: create dependencies from the unversioned SDK member to snapshot versions
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
// of the same member. By having these dependencies, they are mutated for multiple Mainline modules
|
|
|
|
// (apex and apk), each of which might want different sdks to be built with. For example, if both
|
|
|
|
// apex A and B are referencing libfoo which is a member of sdk 'mysdk', the two APEXes can be
|
|
|
|
// built with libfoo.mysdk.11 and libfoo.mysdk.12, respectively depending on which sdk they are
|
|
|
|
// using.
|
|
|
|
func memberInterVersionMutator(mctx android.BottomUpMutatorContext) {
|
|
|
|
if m, ok := mctx.Module().(android.SdkAware); ok && m.IsInAnySdk() {
|
2019-10-11 13:59:13 +08:00
|
|
|
if !m.ContainingSdk().Unversioned() {
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
memberName := m.MemberName()
|
2020-01-14 22:06:09 +08:00
|
|
|
tag := sdkMemberVersionedDepTag{member: memberName, version: m.ContainingSdk().Version}
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
mctx.AddReverseDependency(mctx.Module(), tag, memberName)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Step 4: transitively ripple down the SDK requirements from the root modules like APEX to its
|
|
|
|
// descendants
|
|
|
|
func sdkDepsMutator(mctx android.TopDownMutatorContext) {
|
2020-07-22 20:00:54 +08:00
|
|
|
if parent, ok := mctx.Module().(interface {
|
|
|
|
android.DepIsInSameApex
|
|
|
|
android.RequiredSdks
|
|
|
|
}); ok {
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
// Module types for Mainline modules (e.g. APEX) are expected to implement RequiredSdks()
|
|
|
|
// by reading its own properties like `uses_sdks`.
|
2020-07-22 20:00:54 +08:00
|
|
|
requiredSdks := parent.RequiredSdks()
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
if len(requiredSdks) > 0 {
|
|
|
|
mctx.VisitDirectDeps(func(m android.Module) {
|
2020-07-22 20:00:54 +08:00
|
|
|
// Only propagate required sdks from the apex onto its contents.
|
|
|
|
if dep, ok := m.(android.SdkAware); ok && parent.DepIsInSameApex(mctx, dep) {
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
dep.BuildWithSdks(requiredSdks)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Step 5: if libfoo.mysdk.11 is in the context where version 11 of mysdk is requested, the
|
|
|
|
// versioned module is used instead of the un-versioned (in-development) module libfoo
|
|
|
|
func sdkDepsReplaceMutator(mctx android.BottomUpMutatorContext) {
|
2020-07-22 20:00:54 +08:00
|
|
|
if versionedSdkMember, ok := mctx.Module().(android.SdkAware); ok && versionedSdkMember.IsInAnySdk() {
|
|
|
|
if sdk := versionedSdkMember.ContainingSdk(); !sdk.Unversioned() {
|
|
|
|
// Only replace dependencies to <sdkmember> with <sdkmember@required-version>
|
|
|
|
// if the depending module requires it. e.g.
|
|
|
|
// foo -> sdkmember
|
|
|
|
// will be transformed to:
|
|
|
|
// foo -> sdkmember@1
|
|
|
|
// if and only if foo is a member of an APEX that requires version 1 of the
|
|
|
|
// sdk containing sdkmember.
|
|
|
|
memberName := versionedSdkMember.MemberName()
|
|
|
|
|
|
|
|
// Replace dependencies on sdkmember with a dependency on the current module which
|
|
|
|
// is a versioned prebuilt of the sdkmember if required.
|
|
|
|
mctx.ReplaceDependenciesIf(memberName, func(from blueprint.Module, tag blueprint.DependencyTag, to blueprint.Module) bool {
|
|
|
|
// from - foo
|
|
|
|
// to - sdkmember
|
|
|
|
replace := false
|
|
|
|
if parent, ok := from.(android.RequiredSdks); ok {
|
|
|
|
replace = parent.RequiredSdks().Contains(sdk)
|
|
|
|
}
|
|
|
|
return replace
|
|
|
|
})
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 19:08:41 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2019-10-15 14:20:07 +08:00
|
|
|
|
2020-03-31 22:23:40 +08:00
|
|
|
// Step 6: ensure that the dependencies outside of the APEX are all from the required SDKs
|
2019-10-15 14:20:07 +08:00
|
|
|
func sdkRequirementsMutator(mctx android.TopDownMutatorContext) {
|
|
|
|
if m, ok := mctx.Module().(interface {
|
2020-03-30 22:33:32 +08:00
|
|
|
android.DepIsInSameApex
|
|
|
|
android.RequiredSdks
|
2019-10-15 14:20:07 +08:00
|
|
|
}); ok {
|
|
|
|
requiredSdks := m.RequiredSdks()
|
|
|
|
if len(requiredSdks) == 0 {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
mctx.VisitDirectDeps(func(dep android.Module) {
|
2020-03-31 22:23:40 +08:00
|
|
|
tag := mctx.OtherModuleDependencyTag(dep)
|
|
|
|
if tag == android.DefaultsDepTag {
|
2019-10-15 14:20:07 +08:00
|
|
|
// dependency to defaults is always okay
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2020-03-31 22:23:40 +08:00
|
|
|
// Ignore the dependency from the unversioned member to any versioned members as an
|
|
|
|
// apex that depends on the unversioned member will not also be depending on a versioned
|
|
|
|
// member.
|
|
|
|
if _, ok := tag.(sdkMemberVersionedDepTag); ok {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
// If the dep is outside of the APEX, but is not in any of the
|
2019-10-15 14:20:07 +08:00
|
|
|
// required SDKs, we know that the dep is a violation.
|
|
|
|
if sa, ok := dep.(android.SdkAware); ok {
|
|
|
|
if !m.DepIsInSameApex(mctx, dep) && !requiredSdks.Contains(sa.ContainingSdk()) {
|
|
|
|
mctx.ModuleErrorf("depends on %q (in SDK %q) that isn't part of the required SDKs: %v",
|
|
|
|
sa.Name(), sa.ContainingSdk(), requiredSdks)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|