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 android
|
|
|
|
|
|
|
|
import (
|
2019-12-13 19:22:16 +08:00
|
|
|
"sort"
|
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
|
|
|
"strings"
|
|
|
|
|
2019-11-28 22:31:38 +08:00
|
|
|
"github.com/google/blueprint"
|
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/proptools"
|
|
|
|
)
|
|
|
|
|
|
|
|
// SdkAware is the interface that must be supported by any module to become a member of SDK or to be
|
|
|
|
// built with SDK
|
|
|
|
type SdkAware interface {
|
|
|
|
Module
|
|
|
|
sdkBase() *SdkBase
|
|
|
|
MakeMemberOf(sdk SdkRef)
|
|
|
|
IsInAnySdk() bool
|
|
|
|
ContainingSdk() SdkRef
|
|
|
|
MemberName() string
|
|
|
|
BuildWithSdks(sdks SdkRefs)
|
|
|
|
RequiredSdks() SdkRefs
|
|
|
|
}
|
|
|
|
|
|
|
|
// SdkRef refers to a version of an SDK
|
|
|
|
type SdkRef struct {
|
|
|
|
Name string
|
|
|
|
Version string
|
|
|
|
}
|
|
|
|
|
2019-10-11 13:59:13 +08:00
|
|
|
// Unversioned determines if the SdkRef is referencing to the unversioned SDK module
|
|
|
|
func (s SdkRef) Unversioned() bool {
|
|
|
|
return s.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
|
|
|
}
|
|
|
|
|
2019-10-15 14:20:07 +08:00
|
|
|
// String returns string representation of this SdkRef for debugging purpose
|
|
|
|
func (s SdkRef) String() string {
|
|
|
|
if s.Name == "" {
|
|
|
|
return "(No Sdk)"
|
|
|
|
}
|
|
|
|
if s.Unversioned() {
|
|
|
|
return s.Name
|
|
|
|
}
|
|
|
|
return s.Name + string(SdkVersionSeparator) + s.Version
|
|
|
|
}
|
|
|
|
|
2019-10-11 13:59:13 +08:00
|
|
|
// SdkVersionSeparator is a character used to separate an sdk name and its version
|
|
|
|
const SdkVersionSeparator = '@'
|
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-11 13:59:13 +08:00
|
|
|
// ParseSdkRef parses a `name@version` style string into a corresponding SdkRef 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
|
|
|
func ParseSdkRef(ctx BaseModuleContext, str string, property string) SdkRef {
|
2019-10-11 13:59:13 +08:00
|
|
|
tokens := strings.Split(str, string(SdkVersionSeparator))
|
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(tokens) < 1 || len(tokens) > 2 {
|
|
|
|
ctx.PropertyErrorf(property, "%q does not follow name#version syntax", str)
|
|
|
|
return SdkRef{Name: "invalid sdk name", Version: "invalid sdk version"}
|
|
|
|
}
|
|
|
|
|
|
|
|
name := tokens[0]
|
|
|
|
|
2019-10-11 13:59:13 +08:00
|
|
|
var version 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
|
|
|
if len(tokens) == 2 {
|
|
|
|
version = tokens[1]
|
|
|
|
}
|
|
|
|
|
|
|
|
return SdkRef{Name: name, Version: version}
|
|
|
|
}
|
|
|
|
|
|
|
|
type SdkRefs []SdkRef
|
|
|
|
|
2019-10-11 13:59:13 +08:00
|
|
|
// Contains tells if the given SdkRef is in this list of SdkRef's
|
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 (refs SdkRefs) Contains(s SdkRef) bool {
|
|
|
|
for _, r := range refs {
|
|
|
|
if r == s {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
type sdkProperties struct {
|
|
|
|
// The SDK that this module is a member of. nil if it is not a member of any SDK
|
|
|
|
ContainingSdk *SdkRef `blueprint:"mutated"`
|
|
|
|
|
|
|
|
// The list of SDK names and versions that are used to build this module
|
|
|
|
RequiredSdks SdkRefs `blueprint:"mutated"`
|
|
|
|
|
|
|
|
// Name of the module that this sdk member is representing
|
|
|
|
Sdk_member_name *string
|
|
|
|
}
|
|
|
|
|
|
|
|
// SdkBase is a struct that is expected to be included in module types to implement the SdkAware
|
|
|
|
// interface. InitSdkAwareModule should be called to initialize this struct.
|
|
|
|
type SdkBase struct {
|
|
|
|
properties sdkProperties
|
2019-11-13 03:39:25 +08:00
|
|
|
module 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
|
|
|
}
|
|
|
|
|
|
|
|
func (s *SdkBase) sdkBase() *SdkBase {
|
|
|
|
return s
|
|
|
|
}
|
|
|
|
|
2019-10-11 13:59:13 +08:00
|
|
|
// MakeMemberOf sets this module to be a member of a specific SDK
|
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 *SdkBase) MakeMemberOf(sdk SdkRef) {
|
|
|
|
s.properties.ContainingSdk = &sdk
|
|
|
|
}
|
|
|
|
|
|
|
|
// IsInAnySdk returns true if this module is a member of any SDK
|
|
|
|
func (s *SdkBase) IsInAnySdk() bool {
|
|
|
|
return s.properties.ContainingSdk != nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// ContainingSdk returns the SDK that this module is a member of
|
|
|
|
func (s *SdkBase) ContainingSdk() SdkRef {
|
|
|
|
if s.properties.ContainingSdk != nil {
|
|
|
|
return *s.properties.ContainingSdk
|
|
|
|
}
|
2019-10-11 13:59:13 +08:00
|
|
|
return SdkRef{Name: "", 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
|
|
|
}
|
|
|
|
|
2019-10-11 13:59:13 +08:00
|
|
|
// MemberName returns the name of the module that this SDK member is overriding
|
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 *SdkBase) MemberName() string {
|
|
|
|
return proptools.String(s.properties.Sdk_member_name)
|
|
|
|
}
|
|
|
|
|
|
|
|
// BuildWithSdks is used to mark that this module has to be built with the given SDK(s).
|
|
|
|
func (s *SdkBase) BuildWithSdks(sdks SdkRefs) {
|
|
|
|
s.properties.RequiredSdks = sdks
|
|
|
|
}
|
|
|
|
|
|
|
|
// RequiredSdks returns the SDK(s) that this module has to be built with
|
|
|
|
func (s *SdkBase) RequiredSdks() SdkRefs {
|
|
|
|
return s.properties.RequiredSdks
|
|
|
|
}
|
|
|
|
|
2019-11-13 03:39:25 +08:00
|
|
|
func (s *SdkBase) BuildSnapshot(sdkModuleContext ModuleContext, builder SnapshotBuilder) {
|
|
|
|
sdkModuleContext.ModuleErrorf("module type " + sdkModuleContext.OtherModuleType(s.module) + " cannot be used in an sdk")
|
|
|
|
}
|
|
|
|
|
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
|
|
|
// InitSdkAwareModule initializes the SdkBase struct. This must be called by all modules including
|
|
|
|
// SdkBase.
|
|
|
|
func InitSdkAwareModule(m SdkAware) {
|
|
|
|
base := m.sdkBase()
|
2019-11-13 03:39:25 +08:00
|
|
|
base.module = m
|
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
|
|
|
m.AddProperties(&base.properties)
|
|
|
|
}
|
2019-11-13 03:39:25 +08:00
|
|
|
|
|
|
|
// Provide support for generating the build rules which will build the snapshot.
|
|
|
|
type SnapshotBuilder interface {
|
|
|
|
// Copy src to the dest (which is a snapshot relative path) and add the dest
|
|
|
|
// to the zip
|
|
|
|
CopyToSnapshot(src Path, dest string)
|
|
|
|
|
2019-11-13 03:39:36 +08:00
|
|
|
// Unzip the supplied zip into the snapshot relative directory destDir.
|
|
|
|
UnzipToSnapshot(zipPath Path, destDir string)
|
|
|
|
|
2019-11-28 01:43:54 +08:00
|
|
|
// Add a new prebuilt module to the snapshot. The returned module
|
|
|
|
// must be populated with the module type specific properties. The following
|
|
|
|
// properties will be automatically populated.
|
|
|
|
//
|
|
|
|
// * name
|
|
|
|
// * sdk_member_name
|
|
|
|
// * prefer
|
|
|
|
//
|
|
|
|
// This will result in two Soong modules being generated in the Android. One
|
|
|
|
// that is versioned, coupled to the snapshot version and marked as
|
|
|
|
// prefer=true. And one that is not versioned, not marked as prefer=true and
|
|
|
|
// will only be used if the equivalently named non-prebuilt module is not
|
|
|
|
// present.
|
2019-12-06 02:19:29 +08:00
|
|
|
AddPrebuiltModule(member SdkMember, moduleType string) BpModule
|
2020-01-14 05:03:22 +08:00
|
|
|
|
|
|
|
// The property tag to use when adding a property to a BpModule that contains
|
|
|
|
// references to other sdk members. Using this will ensure that the reference
|
|
|
|
// is correctly output for both versioned and unversioned prebuilts in the
|
|
|
|
// snapshot.
|
|
|
|
//
|
|
|
|
// e.g.
|
|
|
|
// bpPropertySet.AddPropertyWithTag("libs", []string{"member1", "member2"}, builder.SdkMemberReferencePropertyTag())
|
|
|
|
SdkMemberReferencePropertyTag() BpPropertyTag
|
2019-11-28 01:43:54 +08:00
|
|
|
}
|
|
|
|
|
2020-01-15 22:23:52 +08:00
|
|
|
type BpPropertyTag interface{}
|
|
|
|
|
2019-11-28 01:43:54 +08:00
|
|
|
// A set of properties for use in a .bp file.
|
|
|
|
type BpPropertySet interface {
|
|
|
|
// Add a property, the value can be one of the following types:
|
|
|
|
// * string
|
|
|
|
// * array of the above
|
|
|
|
// * bool
|
|
|
|
// * BpPropertySet
|
|
|
|
//
|
2020-01-15 22:23:52 +08:00
|
|
|
// It is an error if multiple properties with the same name are added.
|
2019-11-28 01:43:54 +08:00
|
|
|
AddProperty(name string, value interface{})
|
|
|
|
|
2020-01-15 22:23:52 +08:00
|
|
|
// Add a property with an associated tag
|
|
|
|
AddPropertyWithTag(name string, value interface{}, tag BpPropertyTag)
|
|
|
|
|
2019-11-28 01:43:54 +08:00
|
|
|
// Add a property set with the specified name and return so that additional
|
|
|
|
// properties can be added.
|
|
|
|
AddPropertySet(name string) BpPropertySet
|
|
|
|
}
|
|
|
|
|
|
|
|
// A .bp module definition.
|
|
|
|
type BpModule interface {
|
|
|
|
BpPropertySet
|
2019-11-13 03:39:25 +08:00
|
|
|
}
|
2019-11-28 22:31:38 +08:00
|
|
|
|
|
|
|
// An individual member of the SDK, includes all of the variants that the SDK
|
|
|
|
// requires.
|
|
|
|
type SdkMember interface {
|
|
|
|
// The name of the member.
|
|
|
|
Name() string
|
|
|
|
|
|
|
|
// All the variants required by the SDK.
|
|
|
|
Variants() []SdkAware
|
|
|
|
}
|
|
|
|
|
2019-11-20 03:44:10 +08:00
|
|
|
type SdkMemberTypeDependencyTag interface {
|
|
|
|
blueprint.DependencyTag
|
|
|
|
|
|
|
|
SdkMemberType() SdkMemberType
|
|
|
|
}
|
|
|
|
|
|
|
|
type sdkMemberDependencyTag struct {
|
|
|
|
blueprint.BaseDependencyTag
|
|
|
|
memberType SdkMemberType
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t *sdkMemberDependencyTag) SdkMemberType() SdkMemberType {
|
|
|
|
return t.memberType
|
|
|
|
}
|
|
|
|
|
|
|
|
func DependencyTagForSdkMemberType(memberType SdkMemberType) SdkMemberTypeDependencyTag {
|
|
|
|
return &sdkMemberDependencyTag{memberType: memberType}
|
|
|
|
}
|
|
|
|
|
2019-11-28 22:31:38 +08:00
|
|
|
// Interface that must be implemented for every type that can be a member of an
|
|
|
|
// sdk.
|
|
|
|
//
|
|
|
|
// The basic implementation should look something like this, where ModuleType is
|
|
|
|
// the name of the module type being supported.
|
|
|
|
//
|
2019-12-13 19:22:16 +08:00
|
|
|
// type moduleTypeSdkMemberType struct {
|
|
|
|
// android.SdkMemberTypeBase
|
2019-11-28 22:31:38 +08:00
|
|
|
// }
|
|
|
|
//
|
2019-12-13 19:22:16 +08:00
|
|
|
// func init() {
|
|
|
|
// android.RegisterSdkMemberType(&moduleTypeSdkMemberType{
|
|
|
|
// SdkMemberTypeBase: android.SdkMemberTypeBase{
|
|
|
|
// PropertyName: "module_types",
|
|
|
|
// },
|
|
|
|
// }
|
2019-11-28 22:31:38 +08:00
|
|
|
// }
|
|
|
|
//
|
|
|
|
// ...methods...
|
|
|
|
//
|
|
|
|
type SdkMemberType interface {
|
2019-12-13 19:22:16 +08:00
|
|
|
// The name of the member type property on an sdk module.
|
|
|
|
SdkPropertyName() string
|
|
|
|
|
2019-12-17 01:43:48 +08:00
|
|
|
// True if the member type supports the sdk/sdk_snapshot, false otherwise.
|
|
|
|
UsableWithSdkAndSdkSnapshot() bool
|
|
|
|
|
2020-01-14 04:58:25 +08:00
|
|
|
// Return true if modules of this type can have dependencies which should be
|
|
|
|
// treated as if they are sdk members.
|
|
|
|
//
|
|
|
|
// Any dependency that is to be treated as a member of the sdk needs to implement
|
|
|
|
// SdkAware and be added with an SdkMemberTypeDependencyTag tag.
|
|
|
|
HasTransitiveSdkMembers() bool
|
|
|
|
|
2019-11-28 22:31:38 +08:00
|
|
|
// Add dependencies from the SDK module to all the variants the member
|
|
|
|
// contributes to the SDK. The exact set of variants required is determined
|
|
|
|
// by the SDK and its properties. The dependencies must be added with the
|
|
|
|
// supplied tag.
|
|
|
|
//
|
|
|
|
// The BottomUpMutatorContext provided is for the SDK module.
|
|
|
|
AddDependencies(mctx BottomUpMutatorContext, dependencyTag blueprint.DependencyTag, names []string)
|
|
|
|
|
|
|
|
// Return true if the supplied module is an instance of this member type.
|
|
|
|
//
|
|
|
|
// This is used to check the type of each variant before added to the
|
|
|
|
// SdkMember. Returning false will cause an error to be logged expaining that
|
|
|
|
// the module is not allowed in whichever sdk property it was added.
|
|
|
|
IsInstance(module Module) bool
|
|
|
|
|
|
|
|
// Build the snapshot for the SDK member
|
|
|
|
//
|
|
|
|
// The ModuleContext provided is for the SDK module, so information for
|
|
|
|
// variants in the supplied member can be accessed using the Other... methods.
|
|
|
|
//
|
|
|
|
// The SdkMember is guaranteed to contain variants for which the
|
|
|
|
// IsInstance(Module) method returned true.
|
2020-02-28 00:00:53 +08:00
|
|
|
//
|
|
|
|
// deprecated Use AddPrebuiltModule() instead.
|
2019-11-28 22:31:38 +08:00
|
|
|
BuildSnapshot(sdkModuleContext ModuleContext, builder SnapshotBuilder, member SdkMember)
|
2020-02-28 00:00:53 +08:00
|
|
|
|
|
|
|
// Add a prebuilt module that the sdk will populate.
|
|
|
|
//
|
|
|
|
// Returning nil from this will cause the sdk module type to use the deprecated BuildSnapshot
|
|
|
|
// method to build the snapshot. That method is deprecated because it requires the SdkMemberType
|
|
|
|
// implementation to do all the word.
|
|
|
|
//
|
|
|
|
// Otherwise, returning a non-nil value from this will cause the sdk module type to do the
|
|
|
|
// majority of the work to generate the snapshot. The sdk module code generates the snapshot
|
|
|
|
// as follows:
|
|
|
|
//
|
|
|
|
// * A properties struct of type SdkMemberProperties is created for each variant and
|
|
|
|
// populated with information from the variant by calling PopulateFromVariant(SdkAware)
|
|
|
|
// on the struct.
|
|
|
|
//
|
|
|
|
// * An additional properties struct is created into which the common properties will be
|
|
|
|
// added.
|
|
|
|
//
|
|
|
|
// * The variant property structs are analysed to find exported (capitalized) fields which
|
|
|
|
// have common values. Those fields are cleared and the common value added to the common
|
2020-03-11 06:17:04 +08:00
|
|
|
// properties. A field annotated with a tag of `sdk:"keep"` will be treated as if it
|
|
|
|
// was not capitalized, i.e. not optimized for common values.
|
2020-02-28 00:00:53 +08:00
|
|
|
//
|
|
|
|
// * The sdk module type populates the BpModule structure, creating the arch specific
|
|
|
|
// structure and calls AddToPropertySet(...) on the properties struct to add the member
|
|
|
|
// specific properties in the correct place in the structure.
|
|
|
|
//
|
|
|
|
// * Finally, the FinalizeModule(...) method is called to add any additional properties.
|
|
|
|
// This was created to allow the property ordering in existing tests to be maintained so
|
|
|
|
// as to avoid having to change tests while refactoring.
|
|
|
|
//
|
|
|
|
AddPrebuiltModule(sdkModuleContext ModuleContext, builder SnapshotBuilder, member SdkMember) BpModule
|
|
|
|
|
|
|
|
// Add any additional properties to the end of the module.
|
|
|
|
FinalizeModule(sdkModuleContext ModuleContext, builder SnapshotBuilder, member SdkMember, bpModule BpModule)
|
|
|
|
|
|
|
|
// Create a structure into which variant specific properties can be added.
|
|
|
|
CreateVariantPropertiesStruct() SdkMemberProperties
|
2019-11-28 22:31:38 +08:00
|
|
|
}
|
2019-12-13 19:22:16 +08:00
|
|
|
|
2019-12-17 01:43:48 +08:00
|
|
|
// Base type for SdkMemberType implementations.
|
2019-12-13 19:22:16 +08:00
|
|
|
type SdkMemberTypeBase struct {
|
2020-01-14 04:58:25 +08:00
|
|
|
PropertyName string
|
|
|
|
SupportsSdk bool
|
|
|
|
TransitiveSdkMembers bool
|
2019-12-13 19:22:16 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
func (b *SdkMemberTypeBase) SdkPropertyName() string {
|
|
|
|
return b.PropertyName
|
|
|
|
}
|
|
|
|
|
2019-12-17 01:43:48 +08:00
|
|
|
func (b *SdkMemberTypeBase) UsableWithSdkAndSdkSnapshot() bool {
|
|
|
|
return b.SupportsSdk
|
|
|
|
}
|
|
|
|
|
2020-01-14 04:58:25 +08:00
|
|
|
func (b *SdkMemberTypeBase) HasTransitiveSdkMembers() bool {
|
|
|
|
return b.TransitiveSdkMembers
|
|
|
|
}
|
|
|
|
|
2020-02-28 00:00:53 +08:00
|
|
|
func (b *SdkMemberTypeBase) BuildSnapshot(sdkModuleContext ModuleContext, builder SnapshotBuilder, member SdkMember) {
|
|
|
|
panic("override AddPrebuiltModule")
|
|
|
|
}
|
|
|
|
|
|
|
|
func (b *SdkMemberTypeBase) AddPrebuiltModule(sdkModuleContext ModuleContext, builder SnapshotBuilder, member SdkMember) BpModule {
|
|
|
|
// Returning nil causes the legacy BuildSnapshot method to be used.
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (b *SdkMemberTypeBase) FinalizeModule(sdkModuleContext ModuleContext, builder SnapshotBuilder, member SdkMember, module BpModule) {
|
|
|
|
// Do nothing by default
|
|
|
|
}
|
|
|
|
|
|
|
|
func (b *SdkMemberTypeBase) CreateVariantPropertiesStruct() SdkMemberProperties {
|
|
|
|
panic("override me")
|
|
|
|
}
|
|
|
|
|
2019-12-13 19:22:16 +08:00
|
|
|
// Encapsulates the information about registered SdkMemberTypes.
|
|
|
|
type SdkMemberTypesRegistry struct {
|
|
|
|
// The list of types sorted by property name.
|
|
|
|
list []SdkMemberType
|
|
|
|
|
|
|
|
// The key that uniquely identifies this registry instance.
|
|
|
|
key OnceKey
|
|
|
|
}
|
|
|
|
|
2019-12-17 01:43:48 +08:00
|
|
|
func (r *SdkMemberTypesRegistry) copyAndAppend(memberType SdkMemberType) *SdkMemberTypesRegistry {
|
|
|
|
oldList := r.list
|
2019-12-13 19:22:16 +08:00
|
|
|
|
|
|
|
// Copy the slice just in case this is being read while being modified, e.g. when testing.
|
|
|
|
list := make([]SdkMemberType, 0, len(oldList)+1)
|
|
|
|
list = append(list, oldList...)
|
|
|
|
list = append(list, memberType)
|
|
|
|
|
|
|
|
// Sort the member types by their property name to ensure that registry order has no effect
|
|
|
|
// on behavior.
|
|
|
|
sort.Slice(list, func(i1, i2 int) bool {
|
|
|
|
t1 := list[i1]
|
|
|
|
t2 := list[i2]
|
|
|
|
|
|
|
|
return t1.SdkPropertyName() < t2.SdkPropertyName()
|
|
|
|
})
|
|
|
|
|
|
|
|
// Generate a key that identifies the slice of SdkMemberTypes by joining the property names
|
|
|
|
// from all the SdkMemberType .
|
|
|
|
var properties []string
|
|
|
|
for _, t := range list {
|
|
|
|
properties = append(properties, t.SdkPropertyName())
|
|
|
|
}
|
|
|
|
key := NewOnceKey(strings.Join(properties, "|"))
|
|
|
|
|
|
|
|
// Create a new registry so the pointer uniquely identifies the set of registered types.
|
2019-12-17 01:43:48 +08:00
|
|
|
return &SdkMemberTypesRegistry{
|
2019-12-13 19:22:16 +08:00
|
|
|
list: list,
|
|
|
|
key: key,
|
|
|
|
}
|
|
|
|
}
|
2019-12-17 01:43:48 +08:00
|
|
|
|
|
|
|
func (r *SdkMemberTypesRegistry) RegisteredTypes() []SdkMemberType {
|
|
|
|
return r.list
|
|
|
|
}
|
|
|
|
|
|
|
|
func (r *SdkMemberTypesRegistry) UniqueOnceKey() OnceKey {
|
|
|
|
// Use the pointer to the registry as the unique key.
|
|
|
|
return NewCustomOnceKey(r)
|
|
|
|
}
|
|
|
|
|
|
|
|
// The set of registered SdkMemberTypes, one for sdk module and one for module_exports.
|
|
|
|
var ModuleExportsMemberTypes = &SdkMemberTypesRegistry{}
|
|
|
|
var SdkMemberTypes = &SdkMemberTypesRegistry{}
|
|
|
|
|
|
|
|
// Register an SdkMemberType object to allow them to be used in the sdk and sdk_snapshot module
|
|
|
|
// types.
|
|
|
|
func RegisterSdkMemberType(memberType SdkMemberType) {
|
|
|
|
// All member types are usable with module_exports.
|
|
|
|
ModuleExportsMemberTypes = ModuleExportsMemberTypes.copyAndAppend(memberType)
|
|
|
|
|
|
|
|
// Only those that explicitly indicate it are usable with sdk.
|
|
|
|
if memberType.UsableWithSdkAndSdkSnapshot() {
|
|
|
|
SdkMemberTypes = SdkMemberTypes.copyAndAppend(memberType)
|
|
|
|
}
|
|
|
|
}
|
2020-02-28 00:00:53 +08:00
|
|
|
|
|
|
|
// Base structure for all implementations of SdkMemberProperties.
|
|
|
|
//
|
2020-03-02 18:16:35 +08:00
|
|
|
// Contains common properties that apply across many different member types. These
|
|
|
|
// are not affected by the optimization to extract common values.
|
2020-02-28 00:00:53 +08:00
|
|
|
type SdkMemberPropertiesBase struct {
|
|
|
|
// The setting to use for the compile_multilib property.
|
2020-03-11 06:17:04 +08:00
|
|
|
Compile_multilib string `sdk:"keep"`
|
2020-03-02 18:16:35 +08:00
|
|
|
|
|
|
|
// The number of unique os types supported by the member variants.
|
2020-03-11 06:17:04 +08:00
|
|
|
Os_count int `sdk:"keep"`
|
2020-03-02 18:16:35 +08:00
|
|
|
|
|
|
|
// The os type for which these properties refer.
|
2020-03-11 06:17:04 +08:00
|
|
|
Os OsType `sdk:"keep"`
|
2020-03-02 18:16:35 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// The os prefix to use for any file paths in the sdk.
|
|
|
|
//
|
|
|
|
// Is an empty string if the member only provides variants for a single os type, otherwise
|
|
|
|
// is the OsType.Name.
|
|
|
|
func (b *SdkMemberPropertiesBase) OsPrefix() string {
|
|
|
|
if b.Os_count == 1 {
|
|
|
|
return ""
|
|
|
|
} else {
|
|
|
|
return b.Os.Name
|
|
|
|
}
|
2020-02-28 00:00:53 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
func (b *SdkMemberPropertiesBase) Base() *SdkMemberPropertiesBase {
|
|
|
|
return b
|
|
|
|
}
|
|
|
|
|
|
|
|
// Interface to be implemented on top of a structure that contains variant specific
|
|
|
|
// information.
|
|
|
|
//
|
|
|
|
// Struct fields that are capitalized are examined for common values to extract. Fields
|
|
|
|
// that are not capitalized are assumed to be arch specific.
|
|
|
|
type SdkMemberProperties interface {
|
|
|
|
// Access the base structure.
|
|
|
|
Base() *SdkMemberPropertiesBase
|
|
|
|
|
|
|
|
// Populate the structure with information from the variant.
|
|
|
|
PopulateFromVariant(variant SdkAware)
|
|
|
|
|
|
|
|
// Add the information from the structure to the property set.
|
|
|
|
AddToPropertySet(sdkModuleContext ModuleContext, builder SnapshotBuilder, propertySet BpPropertySet)
|
|
|
|
}
|