2018-10-10 07:01:00 +02:00
|
|
|
// Copyright (C) 2018 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 apex
|
|
|
|
|
|
|
|
import (
|
|
|
|
"fmt"
|
2019-11-19 18:26:02 +01:00
|
|
|
"path"
|
2018-10-10 07:01:00 +02:00
|
|
|
"path/filepath"
|
2018-10-10 07:05:29 +02:00
|
|
|
"sort"
|
2018-10-10 07:01:00 +02:00
|
|
|
"strings"
|
2019-08-23 04:17:39 +02:00
|
|
|
"sync"
|
2018-10-10 07:01:00 +02:00
|
|
|
|
|
|
|
"android/soong/android"
|
|
|
|
"android/soong/cc"
|
|
|
|
"android/soong/java"
|
2019-02-27 23:19:50 +01:00
|
|
|
"android/soong/python"
|
2018-10-10 07:01:00 +02:00
|
|
|
|
|
|
|
"github.com/google/blueprint"
|
2019-02-27 23:19:50 +01:00
|
|
|
"github.com/google/blueprint/bootstrap"
|
2018-10-10 07:01:00 +02:00
|
|
|
"github.com/google/blueprint/proptools"
|
|
|
|
)
|
|
|
|
|
2019-10-23 09:46:38 +02:00
|
|
|
const (
|
|
|
|
imageApexSuffix = ".apex"
|
|
|
|
zipApexSuffix = ".zipapex"
|
2019-10-22 06:58:29 +02:00
|
|
|
flattenedSuffix = ".flattened"
|
2019-10-23 09:46:38 +02:00
|
|
|
|
2019-10-22 06:58:29 +02:00
|
|
|
imageApexType = "image"
|
|
|
|
zipApexType = "zip"
|
|
|
|
flattenedApexType = "flattened"
|
2019-10-23 09:46:38 +02:00
|
|
|
)
|
2018-10-10 07:01:00 +02:00
|
|
|
|
|
|
|
type dependencyTag struct {
|
|
|
|
blueprint.BaseDependencyTag
|
|
|
|
name string
|
|
|
|
}
|
|
|
|
|
|
|
|
var (
|
2018-10-30 13:20:05 +01:00
|
|
|
sharedLibTag = dependencyTag{name: "sharedLib"}
|
|
|
|
executableTag = dependencyTag{name: "executable"}
|
|
|
|
javaLibTag = dependencyTag{name: "javaLib"}
|
|
|
|
prebuiltTag = dependencyTag{name: "prebuilt"}
|
2019-06-26 13:48:34 +02:00
|
|
|
testTag = dependencyTag{name: "test"}
|
2018-10-30 13:20:05 +01:00
|
|
|
keyTag = dependencyTag{name: "key"}
|
|
|
|
certificateTag = dependencyTag{name: "certificate"}
|
2019-06-27 04:30:33 +02:00
|
|
|
usesTag = dependencyTag{name: "uses"}
|
2019-08-27 06:55:42 +02:00
|
|
|
androidAppTag = dependencyTag{name: "androidApp"}
|
2018-10-10 07:01:00 +02:00
|
|
|
)
|
|
|
|
|
|
|
|
func init() {
|
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 13:08:41 +02:00
|
|
|
android.RegisterModuleType("apex", BundleFactory)
|
2019-02-07 22:20:53 +01:00
|
|
|
android.RegisterModuleType("apex_test", testApexBundleFactory)
|
2019-08-23 04:17:39 +02:00
|
|
|
android.RegisterModuleType("apex_vndk", vndkApexBundleFactory)
|
2019-02-07 08:27:23 +01:00
|
|
|
android.RegisterModuleType("apex_defaults", defaultsFactory)
|
2019-03-26 23:07:36 +01:00
|
|
|
android.RegisterModuleType("prebuilt_apex", PrebuiltFactory)
|
2019-11-15 10:40:32 +01:00
|
|
|
android.RegisterModuleType("override_apex", overrideApexFactory)
|
2018-10-10 07:01:00 +02:00
|
|
|
|
2019-10-18 09:26:59 +02:00
|
|
|
android.PreDepsMutators(RegisterPreDepsMutators)
|
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 13:08:41 +02:00
|
|
|
android.PostDepsMutators(RegisterPostDepsMutators)
|
2019-10-08 14:59:58 +02:00
|
|
|
|
|
|
|
android.RegisterMakeVarsProvider(pctx, func(ctx android.MakeVarsContext) {
|
|
|
|
apexFileContextsInfos := apexFileContextsInfos(ctx.Config())
|
|
|
|
sort.Strings(*apexFileContextsInfos)
|
|
|
|
ctx.Strict("APEX_FILE_CONTEXTS_INFOS", strings.Join(*apexFileContextsInfos, " "))
|
|
|
|
})
|
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 13:08:41 +02:00
|
|
|
}
|
|
|
|
|
2019-10-18 09:26:59 +02:00
|
|
|
func RegisterPreDepsMutators(ctx android.RegisterMutatorsContext) {
|
|
|
|
ctx.TopDown("apex_vndk", apexVndkMutator).Parallel()
|
|
|
|
ctx.BottomUp("apex_vndk_deps", apexVndkDepsMutator).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 13:08:41 +02:00
|
|
|
func RegisterPostDepsMutators(ctx android.RegisterMutatorsContext) {
|
2019-11-15 02:38:39 +01:00
|
|
|
ctx.BottomUp("apex_deps", apexDepsMutator)
|
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 13:08:41 +02:00
|
|
|
ctx.BottomUp("apex", apexMutator).Parallel()
|
|
|
|
ctx.BottomUp("apex_flattened", apexFlattenedMutator).Parallel()
|
|
|
|
ctx.BottomUp("apex_uses", apexUsesMutator).Parallel()
|
2018-10-10 07:01:00 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// Mark the direct and transitive dependencies of apex bundles so that they
|
|
|
|
// can be built for the apex bundles.
|
2019-11-15 02:38:39 +01:00
|
|
|
func apexDepsMutator(mctx android.BottomUpMutatorContext) {
|
2019-02-04 23:45:06 +01:00
|
|
|
if a, ok := mctx.Module().(*apexBundle); ok {
|
2018-11-16 20:36:28 +01:00
|
|
|
apexBundleName := mctx.ModuleName()
|
2018-10-10 07:01:00 +02:00
|
|
|
mctx.WalkDeps(func(child, parent android.Module) bool {
|
Don't create unnecessary APEX variations
This change fixes a problem that APEX variations are created for the
modules that actually shouldn't built for any APEX. For example,
consider this case.
apex { name: "myapex", native_shared_libs: ["mylib"],}
cc_library { name: "mylib", shared_libs: ["libfoo#10"],}
cc_library { name: "libfoo",
shared_libs: ["libbar"],
stubs: { versions: ["10"], }, }
cc_library { name: "libbar", ...}
Before this change, both the stubs and non-stubs variations of libfoo
were mutated with apexMuator, which is incorrect for the non-stubs
varia; there is no dependency chain from the apex "myapex" to the
non-stubs variation, but to the stubs variation due to the #10 syntax.
This was happening becauses we used the name of the module to determine
whether it should be built for APEX or not. Both stubs and non-stubs
variations have the same module name "libfoo".
Fixing this issue by recording the list of APEX variations required
directly on the module. So, the stubs variation of libfoo has myapex in
its apex variations list, but the non-stubs variation doesn't, and thus
apexMutator does not pick up the non-stubs variation.
Test: m (apex_test updated and passing)
Test: cherry-pick ag/5747464 and m
Change-Id: I31e618626809a828a55fff513ef5f81f79637afa
2018-12-10 17:35:25 +01:00
|
|
|
depName := mctx.OtherModuleName(child)
|
|
|
|
// If the parent is apexBundle, this child is directly depended.
|
|
|
|
_, directDep := parent.(*apexBundle)
|
2019-02-07 22:20:53 +01:00
|
|
|
if a.installable() && !a.testApex {
|
2019-02-04 23:45:06 +01:00
|
|
|
// TODO(b/123892969): Workaround for not having any way to annotate test-apexs
|
|
|
|
// non-installable apex's cannot be installed and so should not prevent libraries from being
|
|
|
|
// installed to the system.
|
|
|
|
android.UpdateApexDependency(apexBundleName, depName, directDep)
|
|
|
|
}
|
Don't create unnecessary APEX variations
This change fixes a problem that APEX variations are created for the
modules that actually shouldn't built for any APEX. For example,
consider this case.
apex { name: "myapex", native_shared_libs: ["mylib"],}
cc_library { name: "mylib", shared_libs: ["libfoo#10"],}
cc_library { name: "libfoo",
shared_libs: ["libbar"],
stubs: { versions: ["10"], }, }
cc_library { name: "libbar", ...}
Before this change, both the stubs and non-stubs variations of libfoo
were mutated with apexMuator, which is incorrect for the non-stubs
varia; there is no dependency chain from the apex "myapex" to the
non-stubs variation, but to the stubs variation due to the #10 syntax.
This was happening becauses we used the name of the module to determine
whether it should be built for APEX or not. Both stubs and non-stubs
variations have the same module name "libfoo".
Fixing this issue by recording the list of APEX variations required
directly on the module. So, the stubs variation of libfoo has myapex in
its apex variations list, but the non-stubs variation doesn't, and thus
apexMutator does not pick up the non-stubs variation.
Test: m (apex_test updated and passing)
Test: cherry-pick ag/5747464 and m
Change-Id: I31e618626809a828a55fff513ef5f81f79637afa
2018-12-10 17:35:25 +01:00
|
|
|
|
2019-12-27 06:11:47 +01:00
|
|
|
if am, ok := child.(android.ApexModule); ok && am.CanHaveApexVariants() &&
|
|
|
|
(directDep || am.DepIsInSameApex(mctx, child)) {
|
Don't create unnecessary APEX variations
This change fixes a problem that APEX variations are created for the
modules that actually shouldn't built for any APEX. For example,
consider this case.
apex { name: "myapex", native_shared_libs: ["mylib"],}
cc_library { name: "mylib", shared_libs: ["libfoo#10"],}
cc_library { name: "libfoo",
shared_libs: ["libbar"],
stubs: { versions: ["10"], }, }
cc_library { name: "libbar", ...}
Before this change, both the stubs and non-stubs variations of libfoo
were mutated with apexMuator, which is incorrect for the non-stubs
varia; there is no dependency chain from the apex "myapex" to the
non-stubs variation, but to the stubs variation due to the #10 syntax.
This was happening becauses we used the name of the module to determine
whether it should be built for APEX or not. Both stubs and non-stubs
variations have the same module name "libfoo".
Fixing this issue by recording the list of APEX variations required
directly on the module. So, the stubs variation of libfoo has myapex in
its apex variations list, but the non-stubs variation doesn't, and thus
apexMutator does not pick up the non-stubs variation.
Test: m (apex_test updated and passing)
Test: cherry-pick ag/5747464 and m
Change-Id: I31e618626809a828a55fff513ef5f81f79637afa
2018-12-10 17:35:25 +01:00
|
|
|
am.BuildForApex(apexBundleName)
|
2018-10-10 07:01:00 +02:00
|
|
|
return true
|
|
|
|
} else {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create apex variations if a module is included in APEX(s).
|
|
|
|
func apexMutator(mctx android.BottomUpMutatorContext) {
|
|
|
|
if am, ok := mctx.Module().(android.ApexModule); ok && am.CanHaveApexVariants() {
|
Don't create unnecessary APEX variations
This change fixes a problem that APEX variations are created for the
modules that actually shouldn't built for any APEX. For example,
consider this case.
apex { name: "myapex", native_shared_libs: ["mylib"],}
cc_library { name: "mylib", shared_libs: ["libfoo#10"],}
cc_library { name: "libfoo",
shared_libs: ["libbar"],
stubs: { versions: ["10"], }, }
cc_library { name: "libbar", ...}
Before this change, both the stubs and non-stubs variations of libfoo
were mutated with apexMuator, which is incorrect for the non-stubs
varia; there is no dependency chain from the apex "myapex" to the
non-stubs variation, but to the stubs variation due to the #10 syntax.
This was happening becauses we used the name of the module to determine
whether it should be built for APEX or not. Both stubs and non-stubs
variations have the same module name "libfoo".
Fixing this issue by recording the list of APEX variations required
directly on the module. So, the stubs variation of libfoo has myapex in
its apex variations list, but the non-stubs variation doesn't, and thus
apexMutator does not pick up the non-stubs variation.
Test: m (apex_test updated and passing)
Test: cherry-pick ag/5747464 and m
Change-Id: I31e618626809a828a55fff513ef5f81f79637afa
2018-12-10 17:35:25 +01:00
|
|
|
am.CreateApexVariations(mctx)
|
2019-11-19 18:26:02 +01:00
|
|
|
} else if _, ok := mctx.Module().(*apexBundle); ok {
|
2018-10-10 07:01:00 +02:00
|
|
|
// apex bundle itself is mutated so that it and its modules have same
|
|
|
|
// apex variant.
|
|
|
|
apexBundleName := mctx.ModuleName()
|
|
|
|
mctx.CreateVariations(apexBundleName)
|
2019-11-15 10:40:32 +01:00
|
|
|
} else if o, ok := mctx.Module().(*OverrideApex); ok {
|
|
|
|
apexBundleName := o.GetOverriddenModuleName()
|
|
|
|
if apexBundleName == "" {
|
|
|
|
mctx.ModuleErrorf("base property is not set")
|
|
|
|
return
|
|
|
|
}
|
|
|
|
mctx.CreateVariations(apexBundleName)
|
2018-10-10 07:01:00 +02:00
|
|
|
}
|
2019-11-15 10:40:32 +01:00
|
|
|
|
2018-10-10 07:01:00 +02:00
|
|
|
}
|
2019-09-06 10:37:42 +02:00
|
|
|
|
2019-10-08 14:59:58 +02:00
|
|
|
var (
|
|
|
|
apexFileContextsInfosKey = android.NewOnceKey("apexFileContextsInfosKey")
|
|
|
|
apexFileContextsInfosMutex sync.Mutex
|
|
|
|
)
|
|
|
|
|
|
|
|
func apexFileContextsInfos(config android.Config) *[]string {
|
|
|
|
return config.Once(apexFileContextsInfosKey, func() interface{} {
|
|
|
|
return &[]string{}
|
|
|
|
}).(*[]string)
|
|
|
|
}
|
|
|
|
|
2019-11-19 18:26:02 +01:00
|
|
|
func addFlattenedFileContextsInfos(ctx android.BaseModuleContext, fileContextsInfo string) {
|
2019-10-08 14:59:58 +02:00
|
|
|
apexFileContextsInfosMutex.Lock()
|
|
|
|
defer apexFileContextsInfosMutex.Unlock()
|
|
|
|
apexFileContextsInfos := apexFileContextsInfos(ctx.Config())
|
2019-11-19 18:26:02 +01:00
|
|
|
*apexFileContextsInfos = append(*apexFileContextsInfos, fileContextsInfo)
|
2019-10-08 14:59:58 +02:00
|
|
|
}
|
|
|
|
|
2019-09-06 10:37:42 +02:00
|
|
|
func apexFlattenedMutator(mctx android.BottomUpMutatorContext) {
|
2019-09-17 06:50:45 +02:00
|
|
|
if ab, ok := mctx.Module().(*apexBundle); ok {
|
2019-10-22 06:58:29 +02:00
|
|
|
var variants []string
|
|
|
|
switch proptools.StringDefault(ab.properties.Payload_type, "image") {
|
|
|
|
case "image":
|
|
|
|
variants = append(variants, imageApexType, flattenedApexType)
|
|
|
|
case "zip":
|
|
|
|
variants = append(variants, zipApexType)
|
|
|
|
case "both":
|
|
|
|
variants = append(variants, imageApexType, zipApexType, flattenedApexType)
|
|
|
|
default:
|
2019-10-08 12:34:03 +02:00
|
|
|
mctx.PropertyErrorf("type", "%q is not one of \"image\", \"zip\", or \"both\".", *ab.properties.Payload_type)
|
2019-10-22 06:58:29 +02:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
modules := mctx.CreateLocalVariations(variants...)
|
|
|
|
|
|
|
|
for i, v := range variants {
|
|
|
|
switch v {
|
|
|
|
case imageApexType:
|
|
|
|
modules[i].(*apexBundle).properties.ApexType = imageApex
|
|
|
|
case zipApexType:
|
|
|
|
modules[i].(*apexBundle).properties.ApexType = zipApex
|
|
|
|
case flattenedApexType:
|
|
|
|
modules[i].(*apexBundle).properties.ApexType = flattenedApex
|
2019-11-19 17:49:42 +01:00
|
|
|
if !mctx.Config().FlattenApex() && ab.Platform() {
|
2019-10-08 12:34:03 +02:00
|
|
|
modules[i].(*apexBundle).MakeAsSystemExt()
|
|
|
|
}
|
2019-10-22 06:58:29 +02:00
|
|
|
}
|
2019-09-06 10:37:42 +02:00
|
|
|
}
|
2019-11-15 10:40:32 +01:00
|
|
|
} else if _, ok := mctx.Module().(*OverrideApex); ok {
|
|
|
|
mctx.CreateVariations(imageApexType, flattenedApexType)
|
2019-09-06 10:37:42 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-06-27 04:30:33 +02:00
|
|
|
func apexUsesMutator(mctx android.BottomUpMutatorContext) {
|
|
|
|
if ab, ok := mctx.Module().(*apexBundle); ok {
|
|
|
|
mctx.AddFarVariationDependencies(nil, usesTag, ab.properties.Uses...)
|
|
|
|
}
|
|
|
|
}
|
2018-10-10 07:01:00 +02:00
|
|
|
|
2019-10-31 19:14:38 +01:00
|
|
|
var (
|
|
|
|
useVendorWhitelistKey = android.NewOnceKey("useVendorWhitelist")
|
|
|
|
)
|
|
|
|
|
|
|
|
// useVendorWhitelist returns the list of APEXes which are allowed to use_vendor.
|
|
|
|
// When use_vendor is used, native modules are built with __ANDROID_VNDK__ and __ANDROID_APEX__,
|
|
|
|
// which may cause compatibility issues. (e.g. libbinder)
|
|
|
|
// Even though libbinder restricts its availability via 'apex_available' property and relies on
|
|
|
|
// yet another macro __ANDROID_APEX_<NAME>__, we restrict usage of "use_vendor:" from other APEX modules
|
|
|
|
// to avoid similar problems.
|
|
|
|
func useVendorWhitelist(config android.Config) []string {
|
|
|
|
return config.Once(useVendorWhitelistKey, func() interface{} {
|
|
|
|
return []string{
|
|
|
|
// swcodec uses "vendor" variants for smaller size
|
|
|
|
"com.android.media.swcodec",
|
|
|
|
"test_com.android.media.swcodec",
|
|
|
|
}
|
|
|
|
}).([]string)
|
|
|
|
}
|
|
|
|
|
|
|
|
// setUseVendorWhitelistForTest overrides useVendorWhitelist and must be
|
|
|
|
// called before the first call to useVendorWhitelist()
|
|
|
|
func setUseVendorWhitelistForTest(config android.Config, whitelist []string) {
|
|
|
|
config.Once(useVendorWhitelistKey, func() interface{} {
|
|
|
|
return whitelist
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2019-01-30 03:07:33 +01:00
|
|
|
type apexNativeDependencies struct {
|
|
|
|
// List of native libraries
|
|
|
|
Native_shared_libs []string
|
2019-08-23 04:17:39 +02:00
|
|
|
|
2019-01-30 03:07:33 +01:00
|
|
|
// List of native executables
|
|
|
|
Binaries []string
|
2019-08-23 04:17:39 +02:00
|
|
|
|
2019-06-26 13:48:34 +02:00
|
|
|
// List of native tests
|
|
|
|
Tests []string
|
2019-01-30 03:07:33 +01:00
|
|
|
}
|
2019-08-23 04:17:39 +02:00
|
|
|
|
2019-01-30 03:07:33 +01:00
|
|
|
type apexMultilibProperties struct {
|
|
|
|
// Native dependencies whose compile_multilib is "first"
|
|
|
|
First apexNativeDependencies
|
|
|
|
|
|
|
|
// Native dependencies whose compile_multilib is "both"
|
|
|
|
Both apexNativeDependencies
|
|
|
|
|
|
|
|
// Native dependencies whose compile_multilib is "prefer32"
|
|
|
|
Prefer32 apexNativeDependencies
|
|
|
|
|
|
|
|
// Native dependencies whose compile_multilib is "32"
|
|
|
|
Lib32 apexNativeDependencies
|
|
|
|
|
|
|
|
// Native dependencies whose compile_multilib is "64"
|
|
|
|
Lib64 apexNativeDependencies
|
|
|
|
}
|
|
|
|
|
2018-10-10 07:01:00 +02:00
|
|
|
type apexBundleProperties struct {
|
|
|
|
// Json manifest file describing meta info of this APEX bundle. Default:
|
2018-11-20 19:04:58 +01:00
|
|
|
// "apex_manifest.json"
|
2019-03-05 07:35:41 +01:00
|
|
|
Manifest *string `android:"path"`
|
2018-10-10 07:01:00 +02:00
|
|
|
|
2019-02-07 18:53:06 +01:00
|
|
|
// AndroidManifest.xml file used for the zip container of this APEX bundle.
|
|
|
|
// If unspecified, a default one is automatically generated.
|
2019-03-05 07:35:41 +01:00
|
|
|
AndroidManifest *string `android:"path"`
|
2019-02-07 18:53:06 +01:00
|
|
|
|
2019-09-19 17:37:20 +02:00
|
|
|
// Canonical name of the APEX bundle. Used to determine the path to the activated APEX on
|
|
|
|
// device (/apex/<apex_name>).
|
|
|
|
// If unspecified, defaults to the value of name.
|
2019-03-18 06:26:32 +01:00
|
|
|
Apex_name *string
|
|
|
|
|
2018-11-09 22:37:15 +01:00
|
|
|
// Determines the file contexts file for setting security context to each file in this APEX bundle.
|
2019-11-19 18:26:02 +01:00
|
|
|
// For platform APEXes, this should points to a file under /system/sepolicy
|
|
|
|
// Default: /system/sepolicy/apex/<module_name>_file_contexts.
|
|
|
|
File_contexts *string `android:"path"`
|
2018-10-10 07:01:00 +02:00
|
|
|
|
|
|
|
// List of native shared libs that are embedded inside this APEX bundle
|
|
|
|
Native_shared_libs []string
|
|
|
|
|
2019-06-26 13:48:34 +02:00
|
|
|
// List of executables that are embedded inside this APEX bundle
|
2018-10-10 07:01:00 +02:00
|
|
|
Binaries []string
|
|
|
|
|
|
|
|
// List of java libraries that are embedded inside this APEX bundle
|
|
|
|
Java_libs []string
|
|
|
|
|
|
|
|
// List of prebuilt files that are embedded inside this APEX bundle
|
|
|
|
Prebuilts []string
|
2018-10-12 14:49:38 +02:00
|
|
|
|
2019-06-26 13:48:34 +02:00
|
|
|
// List of tests that are embedded inside this APEX bundle
|
|
|
|
Tests []string
|
|
|
|
|
2018-10-12 14:49:38 +02:00
|
|
|
// Name of the apex_key module that provides the private key to sign APEX
|
|
|
|
Key *string
|
binaries and native_shared_libraires are multilib-aware props
The properties 'binaries' and 'native_shared_libraries' can be
multilib-aware, i.e, can be under multilib.type where type can be either
first, both, lib32, lib64, or prefer32.
Native modules listed in multilib.first are installed only for the first
ABI of the device. Similarily, multilib.both are for both of the ABIs,
while multilib.lib32 and multilib.lib64 are 32 and 64-bit ABI only,
respectively. multilib.prefer32 is for 32-bit only when 32-bit ABI is
available.
Another change is that the binaries property, when not within multilib,
targets only the first ABI.
Test: m apex.test on ...
1) aosp_arm64 without TARGET_PREFER_32_BIT_EXECUTABLES=true
2) aosp_arm64 with TARGET_PREFER_32_BIT_EXECUTABLES=true
3) aosp_arm
in all cases, vold, surfaceflinger and drmserver are all intalled under
./bin directory of the APEX. And native libraries are installed under
both ./lib and ./lib64 directories in the case of 1) and 2).
Change-Id: Idd7f8526a61bceca89d43c0c69ccedb471b67d31
2018-10-24 14:09:55 +02:00
|
|
|
|
2018-11-30 02:12:15 +01:00
|
|
|
// The type of APEX to build. Controls what the APEX payload is. Either
|
|
|
|
// 'image', 'zip' or 'both'. Default: 'image'.
|
|
|
|
Payload_type *string
|
|
|
|
|
2018-10-30 13:20:05 +01:00
|
|
|
// The name of a certificate in the default certificate directory, blank to use the default product certificate,
|
|
|
|
// or an android_app_certificate module name in the form ":module".
|
|
|
|
Certificate *string
|
|
|
|
|
2018-12-13 15:14:57 +01:00
|
|
|
// Whether this APEX is installable to one of the partitions. Default: true.
|
|
|
|
Installable *bool
|
|
|
|
|
2018-12-19 09:12:36 +01:00
|
|
|
// For native libraries and binaries, use the vendor variant instead of the core (platform) variant.
|
|
|
|
// Default is false.
|
|
|
|
Use_vendor *bool
|
|
|
|
|
2019-01-30 03:31:59 +01:00
|
|
|
// For telling the apex to ignore special handling for system libraries such as bionic. Default is false.
|
|
|
|
Ignore_system_library_special_case *bool
|
|
|
|
|
2019-01-30 03:07:33 +01:00
|
|
|
Multilib apexMultilibProperties
|
2019-02-09 03:50:56 +01:00
|
|
|
|
2019-02-13 12:28:58 +01:00
|
|
|
// List of sanitizer names that this APEX is enabled for
|
|
|
|
SanitizerNames []string `blueprint:"mutated"`
|
2019-06-27 04:30:33 +02:00
|
|
|
|
2019-08-09 07:44:36 +02:00
|
|
|
PreventInstall bool `blueprint:"mutated"`
|
|
|
|
|
|
|
|
HideFromMake bool `blueprint:"mutated"`
|
|
|
|
|
2019-06-27 04:30:33 +02:00
|
|
|
// Indicates this APEX provides C++ shared libaries to other APEXes. Default: false.
|
|
|
|
Provide_cpp_shared_libs *bool
|
|
|
|
|
|
|
|
// List of providing APEXes' names so that this APEX can depend on provided shared libraries.
|
|
|
|
Uses []string
|
2019-08-31 15:38:05 +02:00
|
|
|
|
|
|
|
// A txt file containing list of files that are whitelisted to be included in this APEX.
|
|
|
|
Whitelisted_files *string
|
2019-08-27 06:55:42 +02:00
|
|
|
|
2019-10-22 06:58:29 +02:00
|
|
|
// package format of this apex variant; could be non-flattened, flattened, or zip.
|
|
|
|
// imageApex, zipApex or flattened
|
|
|
|
ApexType apexPackaging `blueprint:"mutated"`
|
2019-09-17 06:50:45 +02: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 13:08:41 +02:00
|
|
|
// List of SDKs that are used to build this APEX. A reference to an SDK should be either
|
|
|
|
// `name#version` or `name` which is an alias for `name#current`. If left empty, `platform#current`
|
|
|
|
// is implied. This value affects all modules included in this APEX. In other words, they are
|
|
|
|
// also built with the SDKs specified here.
|
|
|
|
Uses_sdks []string
|
2019-11-15 10:40:32 +01:00
|
|
|
|
2019-12-07 18:30:22 +01:00
|
|
|
// Whenever apex_payload.img of the APEX should include dm-verity hashtree.
|
|
|
|
// Should be only used in tests#.
|
|
|
|
Test_only_no_hashtree *bool
|
2019-11-12 05:03:50 +01:00
|
|
|
|
|
|
|
// Whether this APEX should support Android10. Default is false. If this is set true, then apex_manifest.json is bundled as well
|
|
|
|
// because Android10 requires legacy apex_manifest.json instead of apex_manifest.pb
|
|
|
|
Legacy_android10_support *bool
|
2019-01-30 03:07:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
type apexTargetBundleProperties struct {
|
|
|
|
Target struct {
|
|
|
|
// Multilib properties only for android.
|
|
|
|
Android struct {
|
|
|
|
Multilib apexMultilibProperties
|
binaries and native_shared_libraires are multilib-aware props
The properties 'binaries' and 'native_shared_libraries' can be
multilib-aware, i.e, can be under multilib.type where type can be either
first, both, lib32, lib64, or prefer32.
Native modules listed in multilib.first are installed only for the first
ABI of the device. Similarily, multilib.both are for both of the ABIs,
while multilib.lib32 and multilib.lib64 are 32 and 64-bit ABI only,
respectively. multilib.prefer32 is for 32-bit only when 32-bit ABI is
available.
Another change is that the binaries property, when not within multilib,
targets only the first ABI.
Test: m apex.test on ...
1) aosp_arm64 without TARGET_PREFER_32_BIT_EXECUTABLES=true
2) aosp_arm64 with TARGET_PREFER_32_BIT_EXECUTABLES=true
3) aosp_arm
in all cases, vold, surfaceflinger and drmserver are all intalled under
./bin directory of the APEX. And native libraries are installed under
both ./lib and ./lib64 directories in the case of 1) and 2).
Change-Id: Idd7f8526a61bceca89d43c0c69ccedb471b67d31
2018-10-24 14:09:55 +02:00
|
|
|
}
|
2019-08-23 04:17:39 +02:00
|
|
|
|
2019-01-30 03:07:33 +01:00
|
|
|
// Multilib properties only for host.
|
|
|
|
Host struct {
|
|
|
|
Multilib apexMultilibProperties
|
binaries and native_shared_libraires are multilib-aware props
The properties 'binaries' and 'native_shared_libraries' can be
multilib-aware, i.e, can be under multilib.type where type can be either
first, both, lib32, lib64, or prefer32.
Native modules listed in multilib.first are installed only for the first
ABI of the device. Similarily, multilib.both are for both of the ABIs,
while multilib.lib32 and multilib.lib64 are 32 and 64-bit ABI only,
respectively. multilib.prefer32 is for 32-bit only when 32-bit ABI is
available.
Another change is that the binaries property, when not within multilib,
targets only the first ABI.
Test: m apex.test on ...
1) aosp_arm64 without TARGET_PREFER_32_BIT_EXECUTABLES=true
2) aosp_arm64 with TARGET_PREFER_32_BIT_EXECUTABLES=true
3) aosp_arm
in all cases, vold, surfaceflinger and drmserver are all intalled under
./bin directory of the APEX. And native libraries are installed under
both ./lib and ./lib64 directories in the case of 1) and 2).
Change-Id: Idd7f8526a61bceca89d43c0c69ccedb471b67d31
2018-10-24 14:09:55 +02:00
|
|
|
}
|
2019-08-23 04:17:39 +02:00
|
|
|
|
2019-01-30 03:07:33 +01:00
|
|
|
// Multilib properties only for host linux_bionic.
|
|
|
|
Linux_bionic struct {
|
|
|
|
Multilib apexMultilibProperties
|
binaries and native_shared_libraires are multilib-aware props
The properties 'binaries' and 'native_shared_libraries' can be
multilib-aware, i.e, can be under multilib.type where type can be either
first, both, lib32, lib64, or prefer32.
Native modules listed in multilib.first are installed only for the first
ABI of the device. Similarily, multilib.both are for both of the ABIs,
while multilib.lib32 and multilib.lib64 are 32 and 64-bit ABI only,
respectively. multilib.prefer32 is for 32-bit only when 32-bit ABI is
available.
Another change is that the binaries property, when not within multilib,
targets only the first ABI.
Test: m apex.test on ...
1) aosp_arm64 without TARGET_PREFER_32_BIT_EXECUTABLES=true
2) aosp_arm64 with TARGET_PREFER_32_BIT_EXECUTABLES=true
3) aosp_arm
in all cases, vold, surfaceflinger and drmserver are all intalled under
./bin directory of the APEX. And native libraries are installed under
both ./lib and ./lib64 directories in the case of 1) and 2).
Change-Id: Idd7f8526a61bceca89d43c0c69ccedb471b67d31
2018-10-24 14:09:55 +02:00
|
|
|
}
|
2019-08-23 04:17:39 +02:00
|
|
|
|
2019-01-30 03:07:33 +01:00
|
|
|
// Multilib properties only for host linux_glibc.
|
|
|
|
Linux_glibc struct {
|
|
|
|
Multilib apexMultilibProperties
|
binaries and native_shared_libraires are multilib-aware props
The properties 'binaries' and 'native_shared_libraries' can be
multilib-aware, i.e, can be under multilib.type where type can be either
first, both, lib32, lib64, or prefer32.
Native modules listed in multilib.first are installed only for the first
ABI of the device. Similarily, multilib.both are for both of the ABIs,
while multilib.lib32 and multilib.lib64 are 32 and 64-bit ABI only,
respectively. multilib.prefer32 is for 32-bit only when 32-bit ABI is
available.
Another change is that the binaries property, when not within multilib,
targets only the first ABI.
Test: m apex.test on ...
1) aosp_arm64 without TARGET_PREFER_32_BIT_EXECUTABLES=true
2) aosp_arm64 with TARGET_PREFER_32_BIT_EXECUTABLES=true
3) aosp_arm
in all cases, vold, surfaceflinger and drmserver are all intalled under
./bin directory of the APEX. And native libraries are installed under
both ./lib and ./lib64 directories in the case of 1) and 2).
Change-Id: Idd7f8526a61bceca89d43c0c69ccedb471b67d31
2018-10-24 14:09:55 +02:00
|
|
|
}
|
|
|
|
}
|
2018-10-10 07:01:00 +02:00
|
|
|
}
|
|
|
|
|
2019-11-15 10:40:32 +01:00
|
|
|
type overridableProperties struct {
|
|
|
|
// List of APKs to package inside APEX
|
|
|
|
Apps []string
|
2019-12-20 02:32:06 +01:00
|
|
|
|
|
|
|
// Names of modules to be overridden. Listed modules can only be other binaries
|
|
|
|
// (in Make or Soong).
|
|
|
|
// This does not completely prevent installation of the overridden binaries, but if both
|
|
|
|
// binaries would be installed by default (in PRODUCT_PACKAGES) the other binary will be removed
|
|
|
|
// from PRODUCT_PACKAGES.
|
|
|
|
Overrides []string
|
2019-11-15 10:40:32 +01:00
|
|
|
}
|
|
|
|
|
2018-11-30 02:12:15 +01:00
|
|
|
type apexPackaging int
|
|
|
|
|
|
|
|
const (
|
|
|
|
imageApex apexPackaging = iota
|
|
|
|
zipApex
|
2019-10-22 06:58:29 +02:00
|
|
|
flattenedApex
|
2018-11-30 02:12:15 +01:00
|
|
|
)
|
|
|
|
|
2019-10-22 06:58:29 +02:00
|
|
|
// The suffix for the output "file", not the module
|
2018-11-30 02:12:15 +01:00
|
|
|
func (a apexPackaging) suffix() string {
|
|
|
|
switch a {
|
|
|
|
case imageApex:
|
|
|
|
return imageApexSuffix
|
|
|
|
case zipApex:
|
|
|
|
return zipApexSuffix
|
|
|
|
default:
|
2019-07-31 15:09:17 +02:00
|
|
|
panic(fmt.Errorf("unknown APEX type %d", a))
|
2018-11-30 02:12:15 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (a apexPackaging) name() string {
|
|
|
|
switch a {
|
|
|
|
case imageApex:
|
|
|
|
return imageApexType
|
|
|
|
case zipApex:
|
|
|
|
return zipApexType
|
|
|
|
default:
|
2019-07-31 15:09:17 +02:00
|
|
|
panic(fmt.Errorf("unknown APEX type %d", a))
|
2018-11-30 02:12:15 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-18 07:39:01 +01:00
|
|
|
type apexFileClass int
|
|
|
|
|
|
|
|
const (
|
|
|
|
etc apexFileClass = iota
|
|
|
|
nativeSharedLib
|
|
|
|
nativeExecutable
|
|
|
|
shBinary
|
|
|
|
pyBinary
|
|
|
|
goBinary
|
|
|
|
javaSharedLib
|
|
|
|
nativeTest
|
|
|
|
app
|
|
|
|
)
|
|
|
|
|
2018-11-07 18:50:25 +01:00
|
|
|
func (class apexFileClass) NameInMake() string {
|
|
|
|
switch class {
|
|
|
|
case etc:
|
|
|
|
return "ETC"
|
|
|
|
case nativeSharedLib:
|
|
|
|
return "SHARED_LIBRARIES"
|
2019-02-27 23:19:50 +01:00
|
|
|
case nativeExecutable, shBinary, pyBinary, goBinary:
|
2018-11-07 18:50:25 +01:00
|
|
|
return "EXECUTABLES"
|
|
|
|
case javaSharedLib:
|
|
|
|
return "JAVA_LIBRARIES"
|
2019-06-26 13:48:34 +02:00
|
|
|
case nativeTest:
|
|
|
|
return "NATIVE_TESTS"
|
2019-08-27 06:55:42 +02:00
|
|
|
case app:
|
2019-10-11 13:46:25 +02:00
|
|
|
// b/142537672 Why isn't this APP? We want to have full control over
|
|
|
|
// the paths and file names of the apk file under the flattend APEX.
|
|
|
|
// If this is set to APP, then the paths and file names are modified
|
|
|
|
// by the Make build system. For example, it is installed to
|
|
|
|
// /system/apex/<apexname>/app/<Appname>/<apexname>.<Appname>/ instead of
|
|
|
|
// /system/apex/<apexname>/app/<Appname> because the build system automatically
|
|
|
|
// appends module name (which is <apexname>.<Appname> to the path.
|
|
|
|
return "ETC"
|
2018-11-07 18:50:25 +01:00
|
|
|
default:
|
2019-07-31 15:09:17 +02:00
|
|
|
panic(fmt.Errorf("unknown class %d", class))
|
2018-11-07 18:50:25 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-18 07:39:01 +01:00
|
|
|
// apexFile represents a file in an APEX bundle
|
2018-11-07 18:50:25 +01:00
|
|
|
type apexFile struct {
|
|
|
|
builtFile android.Path
|
|
|
|
moduleName string
|
|
|
|
installDir string
|
|
|
|
class apexFileClass
|
2018-12-19 09:36:39 +01:00
|
|
|
module android.Module
|
2019-11-18 07:39:01 +01:00
|
|
|
// list of symlinks that will be created in installDir that point to this apexFile
|
|
|
|
symlinks []string
|
|
|
|
transitiveDep bool
|
2019-12-13 05:28:36 +01:00
|
|
|
moduleDir string
|
2019-12-30 08:56:33 +01:00
|
|
|
|
|
|
|
requiredModuleNames []string
|
|
|
|
targetRequiredModuleNames []string
|
|
|
|
hostRequiredModuleNames []string
|
2020-01-08 05:35:43 +01:00
|
|
|
|
|
|
|
jacocoReportClassesFile android.Path // only for javalibs and apps
|
2019-11-18 07:39:01 +01:00
|
|
|
}
|
|
|
|
|
2019-12-13 05:28:36 +01:00
|
|
|
func newApexFile(ctx android.BaseModuleContext, builtFile android.Path, moduleName string, installDir string, class apexFileClass, module android.Module) apexFile {
|
|
|
|
ret := apexFile{
|
2019-11-18 07:39:01 +01:00
|
|
|
builtFile: builtFile,
|
|
|
|
moduleName: moduleName,
|
|
|
|
installDir: installDir,
|
|
|
|
class: class,
|
|
|
|
module: module,
|
|
|
|
}
|
2019-12-13 05:28:36 +01:00
|
|
|
if module != nil {
|
|
|
|
ret.moduleDir = ctx.OtherModuleDir(module)
|
2019-12-30 08:56:33 +01:00
|
|
|
ret.requiredModuleNames = module.RequiredModuleNames()
|
|
|
|
ret.targetRequiredModuleNames = module.TargetRequiredModuleNames()
|
|
|
|
ret.hostRequiredModuleNames = module.HostRequiredModuleNames()
|
2019-12-13 05:28:36 +01:00
|
|
|
}
|
|
|
|
return ret
|
2019-11-18 07:39:01 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
func (af *apexFile) Ok() bool {
|
2019-12-16 03:47:12 +01:00
|
|
|
return af.builtFile != nil && af.builtFile.String() != ""
|
2018-11-07 18:50:25 +01:00
|
|
|
}
|
|
|
|
|
2018-10-10 07:01:00 +02:00
|
|
|
type apexBundle struct {
|
|
|
|
android.ModuleBase
|
|
|
|
android.DefaultableModuleBase
|
2019-11-15 10:40:32 +01:00
|
|
|
android.OverridableModuleBase
|
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 13:08:41 +02:00
|
|
|
android.SdkBase
|
2018-10-10 07:01:00 +02:00
|
|
|
|
2019-11-15 10:40:32 +01:00
|
|
|
properties apexBundleProperties
|
|
|
|
targetProperties apexTargetBundleProperties
|
|
|
|
overridableProperties overridableProperties
|
2018-10-10 07:01:00 +02:00
|
|
|
|
2019-12-16 14:32:06 +01:00
|
|
|
// specific to apex_vndk modules
|
|
|
|
vndkProperties apexVndkProperties
|
|
|
|
|
2018-11-16 20:36:28 +01:00
|
|
|
bundleModuleFile android.WritablePath
|
2019-10-22 06:58:29 +02:00
|
|
|
outputFile android.WritablePath
|
2019-10-02 07:05:35 +02:00
|
|
|
installDir android.InstallPath
|
2018-11-07 18:50:25 +01:00
|
|
|
|
2019-07-26 16:20:40 +02:00
|
|
|
prebuiltFileToDelete string
|
|
|
|
|
2019-04-01 04:15:50 +02:00
|
|
|
public_key_file android.Path
|
|
|
|
private_key_file android.Path
|
2019-02-18 07:25:04 +01:00
|
|
|
|
|
|
|
container_certificate_file android.Path
|
|
|
|
container_private_key_file android.Path
|
|
|
|
|
2019-11-19 18:26:02 +01:00
|
|
|
fileContexts android.Path
|
|
|
|
|
2018-11-07 18:50:25 +01:00
|
|
|
// list of files to be included in this apex
|
|
|
|
filesInfo []apexFile
|
|
|
|
|
2020-01-09 03:05:18 +01:00
|
|
|
// list of module names that this APEX is depending on
|
2019-02-20 13:49:26 +01:00
|
|
|
externalDeps []string
|
|
|
|
|
2019-10-22 06:58:29 +02:00
|
|
|
testApex bool
|
|
|
|
vndkApex bool
|
2019-11-08 11:51:01 +01:00
|
|
|
artApex bool
|
2019-10-22 06:58:29 +02:00
|
|
|
primaryApexType bool
|
2019-08-01 10:41:43 +02:00
|
|
|
|
2019-11-12 05:03:50 +01:00
|
|
|
manifestJsonOut android.WritablePath
|
|
|
|
manifestPbOut android.WritablePath
|
2019-10-23 09:46:38 +02:00
|
|
|
|
2020-01-07 17:57:58 +01:00
|
|
|
// list of commands to create symlinks for backward compatibility.
|
2019-10-23 09:46:38 +02:00
|
|
|
// these commands will be attached as LOCAL_POST_INSTALL_CMD to
|
2020-01-07 17:57:58 +01:00
|
|
|
// apex package itself(for unflattened build) or apex_manifest(for flattened build)
|
2019-10-23 09:46:38 +02:00
|
|
|
// so that compat symlinks are always installed regardless of TARGET_FLATTEN_APEX setting.
|
|
|
|
compatSymlinks []string
|
2019-10-22 06:58:29 +02:00
|
|
|
|
|
|
|
// Suffix of module name in Android.mk
|
|
|
|
// ".flattened", ".apex", ".zipapex", or ""
|
|
|
|
suffix string
|
2018-10-10 07:01:00 +02:00
|
|
|
}
|
|
|
|
|
binaries and native_shared_libraires are multilib-aware props
The properties 'binaries' and 'native_shared_libraries' can be
multilib-aware, i.e, can be under multilib.type where type can be either
first, both, lib32, lib64, or prefer32.
Native modules listed in multilib.first are installed only for the first
ABI of the device. Similarily, multilib.both are for both of the ABIs,
while multilib.lib32 and multilib.lib64 are 32 and 64-bit ABI only,
respectively. multilib.prefer32 is for 32-bit only when 32-bit ABI is
available.
Another change is that the binaries property, when not within multilib,
targets only the first ABI.
Test: m apex.test on ...
1) aosp_arm64 without TARGET_PREFER_32_BIT_EXECUTABLES=true
2) aosp_arm64 with TARGET_PREFER_32_BIT_EXECUTABLES=true
3) aosp_arm
in all cases, vold, surfaceflinger and drmserver are all intalled under
./bin directory of the APEX. And native libraries are installed under
both ./lib and ./lib64 directories in the case of 1) and 2).
Change-Id: Idd7f8526a61bceca89d43c0c69ccedb471b67d31
2018-10-24 14:09:55 +02:00
|
|
|
func addDependenciesForNativeModules(ctx android.BottomUpMutatorContext,
|
2019-06-26 13:48:34 +02:00
|
|
|
native_shared_libs []string, binaries []string, tests []string,
|
2019-10-16 20:03:10 +02:00
|
|
|
target android.Target, imageVariation string) {
|
binaries and native_shared_libraires are multilib-aware props
The properties 'binaries' and 'native_shared_libraries' can be
multilib-aware, i.e, can be under multilib.type where type can be either
first, both, lib32, lib64, or prefer32.
Native modules listed in multilib.first are installed only for the first
ABI of the device. Similarily, multilib.both are for both of the ABIs,
while multilib.lib32 and multilib.lib64 are 32 and 64-bit ABI only,
respectively. multilib.prefer32 is for 32-bit only when 32-bit ABI is
available.
Another change is that the binaries property, when not within multilib,
targets only the first ABI.
Test: m apex.test on ...
1) aosp_arm64 without TARGET_PREFER_32_BIT_EXECUTABLES=true
2) aosp_arm64 with TARGET_PREFER_32_BIT_EXECUTABLES=true
3) aosp_arm
in all cases, vold, surfaceflinger and drmserver are all intalled under
./bin directory of the APEX. And native libraries are installed under
both ./lib and ./lib64 directories in the case of 1) and 2).
Change-Id: Idd7f8526a61bceca89d43c0c69ccedb471b67d31
2018-10-24 14:09:55 +02:00
|
|
|
// Use *FarVariation* to be able to depend on modules having
|
|
|
|
// conflicting variations with this module. This is required since
|
|
|
|
// arch variant of an APEX bundle is 'common' but it is 'arm' or 'arm64'
|
|
|
|
// for native shared libs.
|
2019-10-16 20:03:10 +02:00
|
|
|
ctx.AddFarVariationDependencies(append(target.Variations(), []blueprint.Variation{
|
2018-12-19 09:12:36 +01:00
|
|
|
{Mutator: "image", Variation: imageVariation},
|
binaries and native_shared_libraires are multilib-aware props
The properties 'binaries' and 'native_shared_libraries' can be
multilib-aware, i.e, can be under multilib.type where type can be either
first, both, lib32, lib64, or prefer32.
Native modules listed in multilib.first are installed only for the first
ABI of the device. Similarily, multilib.both are for both of the ABIs,
while multilib.lib32 and multilib.lib64 are 32 and 64-bit ABI only,
respectively. multilib.prefer32 is for 32-bit only when 32-bit ABI is
available.
Another change is that the binaries property, when not within multilib,
targets only the first ABI.
Test: m apex.test on ...
1) aosp_arm64 without TARGET_PREFER_32_BIT_EXECUTABLES=true
2) aosp_arm64 with TARGET_PREFER_32_BIT_EXECUTABLES=true
3) aosp_arm
in all cases, vold, surfaceflinger and drmserver are all intalled under
./bin directory of the APEX. And native libraries are installed under
both ./lib and ./lib64 directories in the case of 1) and 2).
Change-Id: Idd7f8526a61bceca89d43c0c69ccedb471b67d31
2018-10-24 14:09:55 +02:00
|
|
|
{Mutator: "link", Variation: "shared"},
|
2018-12-07 14:42:47 +01:00
|
|
|
{Mutator: "version", Variation: ""}, // "" is the non-stub variant
|
2019-10-16 20:03:10 +02:00
|
|
|
}...), sharedLibTag, native_shared_libs...)
|
binaries and native_shared_libraires are multilib-aware props
The properties 'binaries' and 'native_shared_libraries' can be
multilib-aware, i.e, can be under multilib.type where type can be either
first, both, lib32, lib64, or prefer32.
Native modules listed in multilib.first are installed only for the first
ABI of the device. Similarily, multilib.both are for both of the ABIs,
while multilib.lib32 and multilib.lib64 are 32 and 64-bit ABI only,
respectively. multilib.prefer32 is for 32-bit only when 32-bit ABI is
available.
Another change is that the binaries property, when not within multilib,
targets only the first ABI.
Test: m apex.test on ...
1) aosp_arm64 without TARGET_PREFER_32_BIT_EXECUTABLES=true
2) aosp_arm64 with TARGET_PREFER_32_BIT_EXECUTABLES=true
3) aosp_arm
in all cases, vold, surfaceflinger and drmserver are all intalled under
./bin directory of the APEX. And native libraries are installed under
both ./lib and ./lib64 directories in the case of 1) and 2).
Change-Id: Idd7f8526a61bceca89d43c0c69ccedb471b67d31
2018-10-24 14:09:55 +02:00
|
|
|
|
2019-10-16 20:03:10 +02:00
|
|
|
ctx.AddFarVariationDependencies(append(target.Variations(),
|
|
|
|
blueprint.Variation{Mutator: "image", Variation: imageVariation}),
|
|
|
|
executableTag, binaries...)
|
2019-06-26 13:48:34 +02:00
|
|
|
|
2019-10-16 20:03:10 +02:00
|
|
|
ctx.AddFarVariationDependencies(append(target.Variations(), []blueprint.Variation{
|
2019-06-26 13:48:34 +02:00
|
|
|
{Mutator: "image", Variation: imageVariation},
|
2019-06-28 16:41:19 +02:00
|
|
|
{Mutator: "test_per_src", Variation: ""}, // "" is the all-tests variant
|
2019-10-16 20:03:10 +02:00
|
|
|
}...), testTag, tests...)
|
binaries and native_shared_libraires are multilib-aware props
The properties 'binaries' and 'native_shared_libraries' can be
multilib-aware, i.e, can be under multilib.type where type can be either
first, both, lib32, lib64, or prefer32.
Native modules listed in multilib.first are installed only for the first
ABI of the device. Similarily, multilib.both are for both of the ABIs,
while multilib.lib32 and multilib.lib64 are 32 and 64-bit ABI only,
respectively. multilib.prefer32 is for 32-bit only when 32-bit ABI is
available.
Another change is that the binaries property, when not within multilib,
targets only the first ABI.
Test: m apex.test on ...
1) aosp_arm64 without TARGET_PREFER_32_BIT_EXECUTABLES=true
2) aosp_arm64 with TARGET_PREFER_32_BIT_EXECUTABLES=true
3) aosp_arm
in all cases, vold, surfaceflinger and drmserver are all intalled under
./bin directory of the APEX. And native libraries are installed under
both ./lib and ./lib64 directories in the case of 1) and 2).
Change-Id: Idd7f8526a61bceca89d43c0c69ccedb471b67d31
2018-10-24 14:09:55 +02:00
|
|
|
}
|
|
|
|
|
2019-01-30 03:07:33 +01:00
|
|
|
func (a *apexBundle) combineProperties(ctx android.BottomUpMutatorContext) {
|
|
|
|
if ctx.Os().Class == android.Device {
|
|
|
|
proptools.AppendProperties(&a.properties.Multilib, &a.targetProperties.Target.Android.Multilib, nil)
|
|
|
|
} else {
|
|
|
|
proptools.AppendProperties(&a.properties.Multilib, &a.targetProperties.Target.Host.Multilib, nil)
|
|
|
|
if ctx.Os().Bionic() {
|
|
|
|
proptools.AppendProperties(&a.properties.Multilib, &a.targetProperties.Target.Linux_bionic.Multilib, nil)
|
|
|
|
} else {
|
|
|
|
proptools.AppendProperties(&a.properties.Multilib, &a.targetProperties.Target.Linux_glibc.Multilib, nil)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-10-10 07:01:00 +02:00
|
|
|
func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) {
|
2019-10-31 19:14:38 +01:00
|
|
|
if proptools.Bool(a.properties.Use_vendor) && !android.InList(a.Name(), useVendorWhitelist(ctx.Config())) {
|
|
|
|
ctx.PropertyErrorf("use_vendor", "not allowed to set use_vendor: true")
|
|
|
|
}
|
|
|
|
|
binaries and native_shared_libraires are multilib-aware props
The properties 'binaries' and 'native_shared_libraries' can be
multilib-aware, i.e, can be under multilib.type where type can be either
first, both, lib32, lib64, or prefer32.
Native modules listed in multilib.first are installed only for the first
ABI of the device. Similarily, multilib.both are for both of the ABIs,
while multilib.lib32 and multilib.lib64 are 32 and 64-bit ABI only,
respectively. multilib.prefer32 is for 32-bit only when 32-bit ABI is
available.
Another change is that the binaries property, when not within multilib,
targets only the first ABI.
Test: m apex.test on ...
1) aosp_arm64 without TARGET_PREFER_32_BIT_EXECUTABLES=true
2) aosp_arm64 with TARGET_PREFER_32_BIT_EXECUTABLES=true
3) aosp_arm
in all cases, vold, surfaceflinger and drmserver are all intalled under
./bin directory of the APEX. And native libraries are installed under
both ./lib and ./lib64 directories in the case of 1) and 2).
Change-Id: Idd7f8526a61bceca89d43c0c69ccedb471b67d31
2018-10-24 14:09:55 +02:00
|
|
|
targets := ctx.MultiTargets()
|
2019-01-05 03:15:24 +01:00
|
|
|
config := ctx.DeviceConfig()
|
2019-01-30 03:07:33 +01:00
|
|
|
|
|
|
|
a.combineProperties(ctx)
|
|
|
|
|
binaries and native_shared_libraires are multilib-aware props
The properties 'binaries' and 'native_shared_libraries' can be
multilib-aware, i.e, can be under multilib.type where type can be either
first, both, lib32, lib64, or prefer32.
Native modules listed in multilib.first are installed only for the first
ABI of the device. Similarily, multilib.both are for both of the ABIs,
while multilib.lib32 and multilib.lib64 are 32 and 64-bit ABI only,
respectively. multilib.prefer32 is for 32-bit only when 32-bit ABI is
available.
Another change is that the binaries property, when not within multilib,
targets only the first ABI.
Test: m apex.test on ...
1) aosp_arm64 without TARGET_PREFER_32_BIT_EXECUTABLES=true
2) aosp_arm64 with TARGET_PREFER_32_BIT_EXECUTABLES=true
3) aosp_arm
in all cases, vold, surfaceflinger and drmserver are all intalled under
./bin directory of the APEX. And native libraries are installed under
both ./lib and ./lib64 directories in the case of 1) and 2).
Change-Id: Idd7f8526a61bceca89d43c0c69ccedb471b67d31
2018-10-24 14:09:55 +02:00
|
|
|
has32BitTarget := false
|
|
|
|
for _, target := range targets {
|
|
|
|
if target.Arch.ArchType.Multilib == "lib32" {
|
|
|
|
has32BitTarget = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for i, target := range targets {
|
|
|
|
// When multilib.* is omitted for native_shared_libs, it implies
|
|
|
|
// multilib.both.
|
2019-10-16 20:03:10 +02:00
|
|
|
ctx.AddFarVariationDependencies(append(target.Variations(), []blueprint.Variation{
|
2019-01-05 03:15:24 +01:00
|
|
|
{Mutator: "image", Variation: a.getImageVariation(config)},
|
2018-10-10 07:01:00 +02:00
|
|
|
{Mutator: "link", Variation: "shared"},
|
2019-10-16 20:03:10 +02:00
|
|
|
}...), sharedLibTag, a.properties.Native_shared_libs...)
|
2018-10-10 07:01:00 +02:00
|
|
|
|
2019-06-26 13:48:34 +02:00
|
|
|
// When multilib.* is omitted for tests, it implies
|
|
|
|
// multilib.both.
|
2019-10-16 20:03:10 +02:00
|
|
|
ctx.AddFarVariationDependencies(append(target.Variations(), []blueprint.Variation{
|
2019-06-26 13:48:34 +02:00
|
|
|
{Mutator: "image", Variation: a.getImageVariation(config)},
|
2019-06-28 16:41:19 +02:00
|
|
|
{Mutator: "test_per_src", Variation: ""}, // "" is the all-tests variant
|
2019-10-16 20:03:10 +02:00
|
|
|
}...), testTag, a.properties.Tests...)
|
2019-06-26 13:48:34 +02:00
|
|
|
|
binaries and native_shared_libraires are multilib-aware props
The properties 'binaries' and 'native_shared_libraries' can be
multilib-aware, i.e, can be under multilib.type where type can be either
first, both, lib32, lib64, or prefer32.
Native modules listed in multilib.first are installed only for the first
ABI of the device. Similarily, multilib.both are for both of the ABIs,
while multilib.lib32 and multilib.lib64 are 32 and 64-bit ABI only,
respectively. multilib.prefer32 is for 32-bit only when 32-bit ABI is
available.
Another change is that the binaries property, when not within multilib,
targets only the first ABI.
Test: m apex.test on ...
1) aosp_arm64 without TARGET_PREFER_32_BIT_EXECUTABLES=true
2) aosp_arm64 with TARGET_PREFER_32_BIT_EXECUTABLES=true
3) aosp_arm
in all cases, vold, surfaceflinger and drmserver are all intalled under
./bin directory of the APEX. And native libraries are installed under
both ./lib and ./lib64 directories in the case of 1) and 2).
Change-Id: Idd7f8526a61bceca89d43c0c69ccedb471b67d31
2018-10-24 14:09:55 +02:00
|
|
|
// Add native modules targetting both ABIs
|
|
|
|
addDependenciesForNativeModules(ctx,
|
|
|
|
a.properties.Multilib.Both.Native_shared_libs,
|
2019-06-26 13:48:34 +02:00
|
|
|
a.properties.Multilib.Both.Binaries,
|
|
|
|
a.properties.Multilib.Both.Tests,
|
2019-10-16 20:03:10 +02:00
|
|
|
target,
|
2019-01-05 03:15:24 +01:00
|
|
|
a.getImageVariation(config))
|
binaries and native_shared_libraires are multilib-aware props
The properties 'binaries' and 'native_shared_libraries' can be
multilib-aware, i.e, can be under multilib.type where type can be either
first, both, lib32, lib64, or prefer32.
Native modules listed in multilib.first are installed only for the first
ABI of the device. Similarily, multilib.both are for both of the ABIs,
while multilib.lib32 and multilib.lib64 are 32 and 64-bit ABI only,
respectively. multilib.prefer32 is for 32-bit only when 32-bit ABI is
available.
Another change is that the binaries property, when not within multilib,
targets only the first ABI.
Test: m apex.test on ...
1) aosp_arm64 without TARGET_PREFER_32_BIT_EXECUTABLES=true
2) aosp_arm64 with TARGET_PREFER_32_BIT_EXECUTABLES=true
3) aosp_arm
in all cases, vold, surfaceflinger and drmserver are all intalled under
./bin directory of the APEX. And native libraries are installed under
both ./lib and ./lib64 directories in the case of 1) and 2).
Change-Id: Idd7f8526a61bceca89d43c0c69ccedb471b67d31
2018-10-24 14:09:55 +02:00
|
|
|
|
2019-01-18 23:37:31 +01:00
|
|
|
isPrimaryAbi := i == 0
|
|
|
|
if isPrimaryAbi {
|
binaries and native_shared_libraires are multilib-aware props
The properties 'binaries' and 'native_shared_libraries' can be
multilib-aware, i.e, can be under multilib.type where type can be either
first, both, lib32, lib64, or prefer32.
Native modules listed in multilib.first are installed only for the first
ABI of the device. Similarily, multilib.both are for both of the ABIs,
while multilib.lib32 and multilib.lib64 are 32 and 64-bit ABI only,
respectively. multilib.prefer32 is for 32-bit only when 32-bit ABI is
available.
Another change is that the binaries property, when not within multilib,
targets only the first ABI.
Test: m apex.test on ...
1) aosp_arm64 without TARGET_PREFER_32_BIT_EXECUTABLES=true
2) aosp_arm64 with TARGET_PREFER_32_BIT_EXECUTABLES=true
3) aosp_arm
in all cases, vold, surfaceflinger and drmserver are all intalled under
./bin directory of the APEX. And native libraries are installed under
both ./lib and ./lib64 directories in the case of 1) and 2).
Change-Id: Idd7f8526a61bceca89d43c0c69ccedb471b67d31
2018-10-24 14:09:55 +02:00
|
|
|
// When multilib.* is omitted for binaries, it implies
|
|
|
|
// multilib.first.
|
2019-10-16 20:03:10 +02:00
|
|
|
ctx.AddFarVariationDependencies(append(target.Variations(),
|
|
|
|
blueprint.Variation{Mutator: "image", Variation: a.getImageVariation(config)}),
|
|
|
|
executableTag, a.properties.Binaries...)
|
binaries and native_shared_libraires are multilib-aware props
The properties 'binaries' and 'native_shared_libraries' can be
multilib-aware, i.e, can be under multilib.type where type can be either
first, both, lib32, lib64, or prefer32.
Native modules listed in multilib.first are installed only for the first
ABI of the device. Similarily, multilib.both are for both of the ABIs,
while multilib.lib32 and multilib.lib64 are 32 and 64-bit ABI only,
respectively. multilib.prefer32 is for 32-bit only when 32-bit ABI is
available.
Another change is that the binaries property, when not within multilib,
targets only the first ABI.
Test: m apex.test on ...
1) aosp_arm64 without TARGET_PREFER_32_BIT_EXECUTABLES=true
2) aosp_arm64 with TARGET_PREFER_32_BIT_EXECUTABLES=true
3) aosp_arm
in all cases, vold, surfaceflinger and drmserver are all intalled under
./bin directory of the APEX. And native libraries are installed under
both ./lib and ./lib64 directories in the case of 1) and 2).
Change-Id: Idd7f8526a61bceca89d43c0c69ccedb471b67d31
2018-10-24 14:09:55 +02:00
|
|
|
|
|
|
|
// Add native modules targetting the first ABI
|
|
|
|
addDependenciesForNativeModules(ctx,
|
|
|
|
a.properties.Multilib.First.Native_shared_libs,
|
2019-06-26 13:48:34 +02:00
|
|
|
a.properties.Multilib.First.Binaries,
|
|
|
|
a.properties.Multilib.First.Tests,
|
2019-10-16 20:03:10 +02:00
|
|
|
target,
|
2019-01-05 03:15:24 +01:00
|
|
|
a.getImageVariation(config))
|
binaries and native_shared_libraires are multilib-aware props
The properties 'binaries' and 'native_shared_libraries' can be
multilib-aware, i.e, can be under multilib.type where type can be either
first, both, lib32, lib64, or prefer32.
Native modules listed in multilib.first are installed only for the first
ABI of the device. Similarily, multilib.both are for both of the ABIs,
while multilib.lib32 and multilib.lib64 are 32 and 64-bit ABI only,
respectively. multilib.prefer32 is for 32-bit only when 32-bit ABI is
available.
Another change is that the binaries property, when not within multilib,
targets only the first ABI.
Test: m apex.test on ...
1) aosp_arm64 without TARGET_PREFER_32_BIT_EXECUTABLES=true
2) aosp_arm64 with TARGET_PREFER_32_BIT_EXECUTABLES=true
3) aosp_arm
in all cases, vold, surfaceflinger and drmserver are all intalled under
./bin directory of the APEX. And native libraries are installed under
both ./lib and ./lib64 directories in the case of 1) and 2).
Change-Id: Idd7f8526a61bceca89d43c0c69ccedb471b67d31
2018-10-24 14:09:55 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
switch target.Arch.ArchType.Multilib {
|
|
|
|
case "lib32":
|
|
|
|
// Add native modules targetting 32-bit ABI
|
|
|
|
addDependenciesForNativeModules(ctx,
|
|
|
|
a.properties.Multilib.Lib32.Native_shared_libs,
|
2019-06-26 13:48:34 +02:00
|
|
|
a.properties.Multilib.Lib32.Binaries,
|
|
|
|
a.properties.Multilib.Lib32.Tests,
|
2019-10-16 20:03:10 +02:00
|
|
|
target,
|
2019-01-05 03:15:24 +01:00
|
|
|
a.getImageVariation(config))
|
binaries and native_shared_libraires are multilib-aware props
The properties 'binaries' and 'native_shared_libraries' can be
multilib-aware, i.e, can be under multilib.type where type can be either
first, both, lib32, lib64, or prefer32.
Native modules listed in multilib.first are installed only for the first
ABI of the device. Similarily, multilib.both are for both of the ABIs,
while multilib.lib32 and multilib.lib64 are 32 and 64-bit ABI only,
respectively. multilib.prefer32 is for 32-bit only when 32-bit ABI is
available.
Another change is that the binaries property, when not within multilib,
targets only the first ABI.
Test: m apex.test on ...
1) aosp_arm64 without TARGET_PREFER_32_BIT_EXECUTABLES=true
2) aosp_arm64 with TARGET_PREFER_32_BIT_EXECUTABLES=true
3) aosp_arm
in all cases, vold, surfaceflinger and drmserver are all intalled under
./bin directory of the APEX. And native libraries are installed under
both ./lib and ./lib64 directories in the case of 1) and 2).
Change-Id: Idd7f8526a61bceca89d43c0c69ccedb471b67d31
2018-10-24 14:09:55 +02:00
|
|
|
|
|
|
|
addDependenciesForNativeModules(ctx,
|
|
|
|
a.properties.Multilib.Prefer32.Native_shared_libs,
|
2019-06-26 13:48:34 +02:00
|
|
|
a.properties.Multilib.Prefer32.Binaries,
|
|
|
|
a.properties.Multilib.Prefer32.Tests,
|
2019-10-16 20:03:10 +02:00
|
|
|
target,
|
2019-01-05 03:15:24 +01:00
|
|
|
a.getImageVariation(config))
|
binaries and native_shared_libraires are multilib-aware props
The properties 'binaries' and 'native_shared_libraries' can be
multilib-aware, i.e, can be under multilib.type where type can be either
first, both, lib32, lib64, or prefer32.
Native modules listed in multilib.first are installed only for the first
ABI of the device. Similarily, multilib.both are for both of the ABIs,
while multilib.lib32 and multilib.lib64 are 32 and 64-bit ABI only,
respectively. multilib.prefer32 is for 32-bit only when 32-bit ABI is
available.
Another change is that the binaries property, when not within multilib,
targets only the first ABI.
Test: m apex.test on ...
1) aosp_arm64 without TARGET_PREFER_32_BIT_EXECUTABLES=true
2) aosp_arm64 with TARGET_PREFER_32_BIT_EXECUTABLES=true
3) aosp_arm
in all cases, vold, surfaceflinger and drmserver are all intalled under
./bin directory of the APEX. And native libraries are installed under
both ./lib and ./lib64 directories in the case of 1) and 2).
Change-Id: Idd7f8526a61bceca89d43c0c69ccedb471b67d31
2018-10-24 14:09:55 +02:00
|
|
|
case "lib64":
|
|
|
|
// Add native modules targetting 64-bit ABI
|
|
|
|
addDependenciesForNativeModules(ctx,
|
|
|
|
a.properties.Multilib.Lib64.Native_shared_libs,
|
2019-06-26 13:48:34 +02:00
|
|
|
a.properties.Multilib.Lib64.Binaries,
|
|
|
|
a.properties.Multilib.Lib64.Tests,
|
2019-10-16 20:03:10 +02:00
|
|
|
target,
|
2019-01-05 03:15:24 +01:00
|
|
|
a.getImageVariation(config))
|
binaries and native_shared_libraires are multilib-aware props
The properties 'binaries' and 'native_shared_libraries' can be
multilib-aware, i.e, can be under multilib.type where type can be either
first, both, lib32, lib64, or prefer32.
Native modules listed in multilib.first are installed only for the first
ABI of the device. Similarily, multilib.both are for both of the ABIs,
while multilib.lib32 and multilib.lib64 are 32 and 64-bit ABI only,
respectively. multilib.prefer32 is for 32-bit only when 32-bit ABI is
available.
Another change is that the binaries property, when not within multilib,
targets only the first ABI.
Test: m apex.test on ...
1) aosp_arm64 without TARGET_PREFER_32_BIT_EXECUTABLES=true
2) aosp_arm64 with TARGET_PREFER_32_BIT_EXECUTABLES=true
3) aosp_arm
in all cases, vold, surfaceflinger and drmserver are all intalled under
./bin directory of the APEX. And native libraries are installed under
both ./lib and ./lib64 directories in the case of 1) and 2).
Change-Id: Idd7f8526a61bceca89d43c0c69ccedb471b67d31
2018-10-24 14:09:55 +02:00
|
|
|
|
|
|
|
if !has32BitTarget {
|
|
|
|
addDependenciesForNativeModules(ctx,
|
|
|
|
a.properties.Multilib.Prefer32.Native_shared_libs,
|
2019-06-26 13:48:34 +02:00
|
|
|
a.properties.Multilib.Prefer32.Binaries,
|
|
|
|
a.properties.Multilib.Prefer32.Tests,
|
2019-10-16 20:03:10 +02:00
|
|
|
target,
|
2019-01-05 03:15:24 +01:00
|
|
|
a.getImageVariation(config))
|
binaries and native_shared_libraires are multilib-aware props
The properties 'binaries' and 'native_shared_libraries' can be
multilib-aware, i.e, can be under multilib.type where type can be either
first, both, lib32, lib64, or prefer32.
Native modules listed in multilib.first are installed only for the first
ABI of the device. Similarily, multilib.both are for both of the ABIs,
while multilib.lib32 and multilib.lib64 are 32 and 64-bit ABI only,
respectively. multilib.prefer32 is for 32-bit only when 32-bit ABI is
available.
Another change is that the binaries property, when not within multilib,
targets only the first ABI.
Test: m apex.test on ...
1) aosp_arm64 without TARGET_PREFER_32_BIT_EXECUTABLES=true
2) aosp_arm64 with TARGET_PREFER_32_BIT_EXECUTABLES=true
3) aosp_arm
in all cases, vold, surfaceflinger and drmserver are all intalled under
./bin directory of the APEX. And native libraries are installed under
both ./lib and ./lib64 directories in the case of 1) and 2).
Change-Id: Idd7f8526a61bceca89d43c0c69ccedb471b67d31
2018-10-24 14:09:55 +02:00
|
|
|
}
|
2019-04-24 23:41:12 +02:00
|
|
|
|
|
|
|
if strings.HasPrefix(ctx.ModuleName(), "com.android.runtime") && target.Os.Class == android.Device {
|
|
|
|
for _, sanitizer := range ctx.Config().SanitizeDevice() {
|
|
|
|
if sanitizer == "hwaddress" {
|
|
|
|
addDependenciesForNativeModules(ctx,
|
|
|
|
[]string{"libclang_rt.hwasan-aarch64-android"},
|
2019-10-16 20:03:10 +02:00
|
|
|
nil, nil, target, a.getImageVariation(config))
|
2019-04-24 23:41:12 +02:00
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
binaries and native_shared_libraires are multilib-aware props
The properties 'binaries' and 'native_shared_libraries' can be
multilib-aware, i.e, can be under multilib.type where type can be either
first, both, lib32, lib64, or prefer32.
Native modules listed in multilib.first are installed only for the first
ABI of the device. Similarily, multilib.both are for both of the ABIs,
while multilib.lib32 and multilib.lib64 are 32 and 64-bit ABI only,
respectively. multilib.prefer32 is for 32-bit only when 32-bit ABI is
available.
Another change is that the binaries property, when not within multilib,
targets only the first ABI.
Test: m apex.test on ...
1) aosp_arm64 without TARGET_PREFER_32_BIT_EXECUTABLES=true
2) aosp_arm64 with TARGET_PREFER_32_BIT_EXECUTABLES=true
3) aosp_arm
in all cases, vold, surfaceflinger and drmserver are all intalled under
./bin directory of the APEX. And native libraries are installed under
both ./lib and ./lib64 directories in the case of 1) and 2).
Change-Id: Idd7f8526a61bceca89d43c0c69ccedb471b67d31
2018-10-24 14:09:55 +02:00
|
|
|
}
|
|
|
|
|
2018-10-12 14:49:38 +02:00
|
|
|
}
|
2018-10-10 07:01:00 +02:00
|
|
|
|
2019-11-20 05:58:28 +01:00
|
|
|
// For prebuilt_etc, use the first variant (64 on 64/32bit device,
|
|
|
|
// 32 on 32bit device) regardless of the TARGET_PREFER_* setting.
|
|
|
|
// b/144532908
|
|
|
|
archForPrebuiltEtc := config.Arches()[0]
|
|
|
|
for _, arch := range config.Arches() {
|
|
|
|
// Prefer 64-bit arch if there is any
|
|
|
|
if arch.ArchType.Multilib == "lib64" {
|
|
|
|
archForPrebuiltEtc = arch
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ctx.AddFarVariationDependencies([]blueprint.Variation{
|
|
|
|
{Mutator: "os", Variation: ctx.Os().String()},
|
|
|
|
{Mutator: "arch", Variation: archForPrebuiltEtc.String()},
|
|
|
|
}, prebuiltTag, a.properties.Prebuilts...)
|
|
|
|
|
2019-10-16 20:03:10 +02:00
|
|
|
ctx.AddFarVariationDependencies(ctx.Config().AndroidCommonTarget.Variations(),
|
|
|
|
javaLibTag, a.properties.Java_libs...)
|
2018-10-10 07:01:00 +02:00
|
|
|
|
2020-01-03 14:25:54 +01:00
|
|
|
// With EMMA_INSTRUMENT_FRAMEWORK=true the ART boot image includes jacoco library.
|
|
|
|
if a.artApex && ctx.Config().IsEnvTrue("EMMA_INSTRUMENT_FRAMEWORK") {
|
|
|
|
ctx.AddFarVariationDependencies(ctx.Config().AndroidCommonTarget.Variations(),
|
|
|
|
javaLibTag, "jacocoagent")
|
|
|
|
}
|
|
|
|
|
2019-02-02 05:13:47 +01:00
|
|
|
if String(a.properties.Key) == "" {
|
|
|
|
ctx.ModuleErrorf("key is missing")
|
|
|
|
return
|
|
|
|
}
|
|
|
|
ctx.AddDependency(ctx.Module(), keyTag, String(a.properties.Key))
|
2018-10-30 13:20:05 +01:00
|
|
|
|
2019-02-11 03:38:15 +01:00
|
|
|
cert := android.SrcIsModule(a.getCertString(ctx))
|
2019-02-02 05:13:47 +01:00
|
|
|
if cert != "" {
|
|
|
|
ctx.AddDependency(ctx.Module(), certificateTag, cert)
|
2018-10-30 13:20:05 +01: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 13:08:41 +02:00
|
|
|
|
|
|
|
// TODO(jiyong): ensure that all apexes are with non-empty uses_sdks
|
|
|
|
if len(a.properties.Uses_sdks) > 0 {
|
|
|
|
sdkRefs := []android.SdkRef{}
|
|
|
|
for _, str := range a.properties.Uses_sdks {
|
|
|
|
parsed := android.ParseSdkRef(ctx, str, "uses_sdks")
|
|
|
|
sdkRefs = append(sdkRefs, parsed)
|
|
|
|
}
|
|
|
|
a.BuildWithSdks(sdkRefs)
|
|
|
|
}
|
2018-10-10 07:01:00 +02:00
|
|
|
}
|
|
|
|
|
2019-11-15 10:40:32 +01:00
|
|
|
func (a *apexBundle) OverridablePropertiesDepsMutator(ctx android.BottomUpMutatorContext) {
|
|
|
|
ctx.AddFarVariationDependencies(ctx.Config().AndroidCommonTarget.Variations(),
|
|
|
|
androidAppTag, a.overridableProperties.Apps...)
|
|
|
|
}
|
|
|
|
|
2019-10-15 08:20:07 +02:00
|
|
|
func (a *apexBundle) DepIsInSameApex(ctx android.BaseModuleContext, dep android.Module) bool {
|
|
|
|
// direct deps of an APEX bundle are all part of the APEX bundle
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
2019-06-06 23:33:29 +02:00
|
|
|
func (a *apexBundle) getCertString(ctx android.BaseModuleContext) string {
|
2019-12-16 09:45:32 +01:00
|
|
|
moduleName := ctx.ModuleName()
|
|
|
|
// VNDK APEXes share the same certificate. To avoid adding a new VNDK version to the OVERRIDE_* list,
|
|
|
|
// we check with the pseudo module name to see if its certificate is overridden.
|
|
|
|
if a.vndkApex {
|
|
|
|
moduleName = vndkApexName
|
|
|
|
}
|
|
|
|
certificate, overridden := ctx.DeviceConfig().OverrideCertificateFor(moduleName)
|
2019-02-11 03:38:15 +01:00
|
|
|
if overridden {
|
2019-02-28 17:22:30 +01:00
|
|
|
return ":" + certificate
|
2019-02-11 03:38:15 +01:00
|
|
|
}
|
|
|
|
return String(a.properties.Certificate)
|
|
|
|
}
|
|
|
|
|
2019-05-29 23:40:35 +02:00
|
|
|
func (a *apexBundle) OutputFiles(tag string) (android.Paths, error) {
|
|
|
|
switch tag {
|
|
|
|
case "":
|
2019-10-22 06:58:29 +02:00
|
|
|
return android.Paths{a.outputFile}, nil
|
2019-05-29 23:40:35 +02:00
|
|
|
default:
|
|
|
|
return nil, fmt.Errorf("unsupported module reference tag %q", tag)
|
2018-12-20 01:54:35 +01:00
|
|
|
}
|
2018-11-27 13:27:08 +01:00
|
|
|
}
|
|
|
|
|
2018-12-13 15:14:57 +01:00
|
|
|
func (a *apexBundle) installable() bool {
|
2019-08-09 07:44:36 +02:00
|
|
|
return !a.properties.PreventInstall && (a.properties.Installable == nil || proptools.Bool(a.properties.Installable))
|
2018-12-13 15:14:57 +01:00
|
|
|
}
|
|
|
|
|
2019-12-07 18:30:22 +01:00
|
|
|
func (a *apexBundle) testOnlyShouldSkipHashtreeGeneration() bool {
|
|
|
|
return proptools.Bool(a.properties.Test_only_no_hashtree)
|
|
|
|
}
|
|
|
|
|
2019-01-05 03:15:24 +01:00
|
|
|
func (a *apexBundle) getImageVariation(config android.DeviceConfig) string {
|
2019-10-18 09:26:59 +02:00
|
|
|
if a.vndkApex {
|
2019-11-19 01:00:16 +01:00
|
|
|
return cc.VendorVariationPrefix + a.vndkVersion(config)
|
2019-10-18 09:26:59 +02:00
|
|
|
}
|
2019-01-05 03:15:24 +01:00
|
|
|
if config.VndkVersion() != "" && proptools.Bool(a.properties.Use_vendor) {
|
2019-11-19 01:00:16 +01:00
|
|
|
return cc.VendorVariationPrefix + config.PlatformVndkVersion()
|
2018-12-19 09:12:36 +01:00
|
|
|
} else {
|
2019-11-19 01:00:16 +01:00
|
|
|
return android.CoreVariation
|
2018-12-19 09:12:36 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-13 12:28:58 +01:00
|
|
|
func (a *apexBundle) EnableSanitizer(sanitizerName string) {
|
|
|
|
if !android.InList(sanitizerName, a.properties.SanitizerNames) {
|
|
|
|
a.properties.SanitizerNames = append(a.properties.SanitizerNames, sanitizerName)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-01-28 11:47:32 +01:00
|
|
|
func (a *apexBundle) IsSanitizerEnabled(ctx android.BaseModuleContext, sanitizerName string) bool {
|
2019-02-13 12:28:58 +01:00
|
|
|
if android.InList(sanitizerName, a.properties.SanitizerNames) {
|
|
|
|
return true
|
2019-02-09 03:50:56 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Then follow the global setting
|
2019-01-28 11:47:32 +01:00
|
|
|
globalSanitizerNames := []string{}
|
|
|
|
if a.Host() {
|
|
|
|
globalSanitizerNames = ctx.Config().SanitizeHost()
|
|
|
|
} else {
|
|
|
|
arches := ctx.Config().SanitizeDeviceArch()
|
|
|
|
if len(arches) == 0 || android.InList(a.Arch().ArchType.Name, arches) {
|
|
|
|
globalSanitizerNames = ctx.Config().SanitizeDevice()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return android.InList(sanitizerName, globalSanitizerNames)
|
2018-12-18 18:47:14 +01:00
|
|
|
}
|
|
|
|
|
2019-08-09 07:44:36 +02:00
|
|
|
func (a *apexBundle) IsNativeCoverageNeeded(ctx android.BaseModuleContext) bool {
|
|
|
|
return ctx.Device() && ctx.DeviceConfig().NativeCoverageEnabled()
|
|
|
|
}
|
|
|
|
|
|
|
|
func (a *apexBundle) PreventInstall() {
|
|
|
|
a.properties.PreventInstall = true
|
|
|
|
}
|
|
|
|
|
|
|
|
func (a *apexBundle) HideFromMake() {
|
|
|
|
a.properties.HideFromMake = true
|
|
|
|
}
|
|
|
|
|
2019-11-18 07:39:01 +01:00
|
|
|
// TODO(jiyong) move apexFileFor* close to the apexFile type definition
|
2019-12-13 05:28:36 +01:00
|
|
|
func apexFileForNativeLibrary(ctx android.BaseModuleContext, ccMod *cc.Module, handleSpecialLibs bool) apexFile {
|
2018-10-10 07:01:00 +02:00
|
|
|
// Decide the APEX-local directory by the multilib of the library
|
|
|
|
// In the future, we may query this to the module.
|
2019-11-18 07:39:01 +01:00
|
|
|
var dirInApex string
|
2019-09-11 00:18:20 +02:00
|
|
|
switch ccMod.Arch().ArchType.Multilib {
|
2018-10-10 07:01:00 +02:00
|
|
|
case "lib32":
|
|
|
|
dirInApex = "lib"
|
|
|
|
case "lib64":
|
|
|
|
dirInApex = "lib64"
|
|
|
|
}
|
2019-09-11 00:18:20 +02:00
|
|
|
dirInApex = filepath.Join(dirInApex, ccMod.RelativeInstallPath())
|
2019-09-17 23:45:31 +02:00
|
|
|
if ccMod.Target().NativeBridge == android.NativeBridgeEnabled {
|
2019-09-11 00:18:20 +02:00
|
|
|
dirInApex = filepath.Join(dirInApex, ccMod.Target().NativeBridgeRelativePath)
|
2018-10-10 07:01:00 +02:00
|
|
|
}
|
2019-12-13 05:28:36 +01:00
|
|
|
if handleSpecialLibs && cc.InstallToBootstrap(ccMod.BaseModuleName(), ctx.Config()) {
|
2019-09-11 00:18:20 +02:00
|
|
|
// Special case for Bionic libs and other libs installed with them. This is
|
|
|
|
// to prevent those libs from being included in the search path
|
|
|
|
// /apex/com.android.runtime/${LIB}. This exclusion is required because
|
|
|
|
// those libs in the Runtime APEX are available via the legacy paths in
|
|
|
|
// /system/lib/. By the init process, the libs in the APEX are bind-mounted
|
|
|
|
// to the legacy paths and thus will be loaded into the default linker
|
|
|
|
// namespace (aka "platform" namespace). If the libs are directly in
|
|
|
|
// /apex/com.android.runtime/${LIB} then the same libs will be loaded again
|
|
|
|
// into the runtime linker namespace, which will result in double loading of
|
|
|
|
// them, which isn't supported.
|
|
|
|
dirInApex = filepath.Join(dirInApex, "bionic")
|
2018-12-20 14:10:17 +01:00
|
|
|
}
|
2018-10-10 07:01:00 +02:00
|
|
|
|
2019-11-18 07:39:01 +01:00
|
|
|
fileToCopy := ccMod.OutputFile().Path()
|
2019-12-13 05:28:36 +01:00
|
|
|
return newApexFile(ctx, fileToCopy, ccMod.Name(), dirInApex, nativeSharedLib, ccMod)
|
2018-10-10 07:01:00 +02:00
|
|
|
}
|
|
|
|
|
2019-12-13 05:28:36 +01:00
|
|
|
func apexFileForExecutable(ctx android.BaseModuleContext, cc *cc.Module) apexFile {
|
2019-11-18 07:39:01 +01:00
|
|
|
dirInApex := filepath.Join("bin", cc.RelativeInstallPath())
|
2019-09-17 23:45:31 +02:00
|
|
|
if cc.Target().NativeBridge == android.NativeBridgeEnabled {
|
2019-07-11 10:23:53 +02:00
|
|
|
dirInApex = filepath.Join(dirInApex, cc.Target().NativeBridgeRelativePath)
|
2019-07-09 09:19:16 +02:00
|
|
|
}
|
2019-11-18 07:39:01 +01:00
|
|
|
fileToCopy := cc.OutputFile().Path()
|
2019-12-13 05:28:36 +01:00
|
|
|
af := newApexFile(ctx, fileToCopy, cc.Name(), dirInApex, nativeExecutable, cc)
|
2019-11-18 07:39:01 +01:00
|
|
|
af.symlinks = cc.Symlinks()
|
|
|
|
return af
|
2018-10-10 07:01:00 +02:00
|
|
|
}
|
|
|
|
|
2019-12-13 05:28:36 +01:00
|
|
|
func apexFileForPyBinary(ctx android.BaseModuleContext, py *python.Module) apexFile {
|
2019-11-18 07:39:01 +01:00
|
|
|
dirInApex := "bin"
|
|
|
|
fileToCopy := py.HostToolPath().Path()
|
2019-12-13 05:28:36 +01:00
|
|
|
return newApexFile(ctx, fileToCopy, py.Name(), dirInApex, pyBinary, py)
|
2019-02-27 23:19:50 +01:00
|
|
|
}
|
2019-12-13 05:28:36 +01:00
|
|
|
func apexFileForGoBinary(ctx android.BaseModuleContext, depName string, gb bootstrap.GoBinaryTool) apexFile {
|
2019-11-18 07:39:01 +01:00
|
|
|
dirInApex := "bin"
|
2019-02-27 23:19:50 +01:00
|
|
|
s, err := filepath.Rel(android.PathForOutput(ctx).String(), gb.InstallPath())
|
|
|
|
if err != nil {
|
|
|
|
ctx.ModuleErrorf("Unable to use compiled binary at %s", gb.InstallPath())
|
2019-11-18 07:39:01 +01:00
|
|
|
return apexFile{}
|
2019-02-27 23:19:50 +01:00
|
|
|
}
|
2019-11-18 07:39:01 +01:00
|
|
|
fileToCopy := android.PathForOutput(ctx, s)
|
|
|
|
// NB: Since go binaries are static we don't need the module for anything here, which is
|
|
|
|
// good since the go tool is a blueprint.Module not an android.Module like we would
|
|
|
|
// normally use.
|
2019-12-13 05:28:36 +01:00
|
|
|
return newApexFile(ctx, fileToCopy, depName, dirInApex, goBinary, nil)
|
2019-02-27 23:19:50 +01:00
|
|
|
}
|
|
|
|
|
2019-12-13 05:28:36 +01:00
|
|
|
func apexFileForShBinary(ctx android.BaseModuleContext, sh *android.ShBinary) apexFile {
|
2019-11-18 07:39:01 +01:00
|
|
|
dirInApex := filepath.Join("bin", sh.SubDir())
|
|
|
|
fileToCopy := sh.OutputFile()
|
2019-12-13 05:28:36 +01:00
|
|
|
af := newApexFile(ctx, fileToCopy, sh.Name(), dirInApex, shBinary, sh)
|
2019-11-18 07:39:01 +01:00
|
|
|
af.symlinks = sh.Symlinks()
|
|
|
|
return af
|
2019-02-05 16:16:29 +01:00
|
|
|
}
|
|
|
|
|
2019-12-18 07:34:32 +01:00
|
|
|
// TODO(b/146586360): replace javaLibrary(in apex/apex.go) with java.Dependency
|
|
|
|
type javaLibrary interface {
|
|
|
|
android.Module
|
|
|
|
java.Dependency
|
|
|
|
}
|
|
|
|
|
|
|
|
func apexFileForJavaLibrary(ctx android.BaseModuleContext, lib javaLibrary) apexFile {
|
2019-11-18 07:39:01 +01:00
|
|
|
dirInApex := "javalib"
|
2019-12-18 07:34:32 +01:00
|
|
|
fileToCopy := lib.DexJar()
|
2020-01-08 05:35:43 +01:00
|
|
|
af := newApexFile(ctx, fileToCopy, lib.Name(), dirInApex, javaSharedLib, lib)
|
|
|
|
af.jacocoReportClassesFile = lib.JacocoReportClassesFile()
|
|
|
|
return af
|
2018-10-10 07:01:00 +02:00
|
|
|
}
|
|
|
|
|
2019-12-13 05:28:36 +01:00
|
|
|
func apexFileForPrebuiltEtc(ctx android.BaseModuleContext, prebuilt android.PrebuiltEtcModule, depName string) apexFile {
|
2019-11-18 07:39:01 +01:00
|
|
|
dirInApex := filepath.Join("etc", prebuilt.SubDir())
|
|
|
|
fileToCopy := prebuilt.OutputFile()
|
2019-12-13 05:28:36 +01:00
|
|
|
return newApexFile(ctx, fileToCopy, depName, dirInApex, etc, prebuilt)
|
2019-08-27 06:55:42 +02:00
|
|
|
}
|
|
|
|
|
2019-12-13 05:28:36 +01:00
|
|
|
func apexFileForAndroidApp(ctx android.BaseModuleContext, aapp interface {
|
2019-11-18 07:39:01 +01:00
|
|
|
android.Module
|
|
|
|
Privileged() bool
|
|
|
|
OutputFile() android.Path
|
2020-01-08 05:35:43 +01:00
|
|
|
JacocoReportClassesFile() android.Path
|
2019-11-18 07:39:01 +01:00
|
|
|
}, pkgName string) apexFile {
|
2019-10-27 01:29:22 +02:00
|
|
|
appDir := "app"
|
2019-11-18 07:39:01 +01:00
|
|
|
if aapp.Privileged() {
|
2019-10-27 01:29:22 +02:00
|
|
|
appDir = "priv-app"
|
|
|
|
}
|
2019-11-18 07:39:01 +01:00
|
|
|
dirInApex := filepath.Join(appDir, pkgName)
|
|
|
|
fileToCopy := aapp.OutputFile()
|
2020-01-08 05:35:43 +01:00
|
|
|
af := newApexFile(ctx, fileToCopy, aapp.Name(), dirInApex, app, aapp)
|
|
|
|
af.jacocoReportClassesFile = aapp.JacocoReportClassesFile()
|
|
|
|
return af
|
2019-10-27 01:29:22 +02:00
|
|
|
}
|
|
|
|
|
2019-08-13 15:55:28 +02:00
|
|
|
// Context "decorator", overriding the InstallBypassMake method to always reply `true`.
|
|
|
|
type flattenedApexContext struct {
|
|
|
|
android.ModuleContext
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *flattenedApexContext) InstallBypassMake() bool {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
2018-10-10 07:01:00 +02:00
|
|
|
func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
2019-10-22 06:58:29 +02:00
|
|
|
buildFlattenedAsDefault := ctx.Config().FlattenApex() && !ctx.Config().UnbundledBuild()
|
|
|
|
switch a.properties.ApexType {
|
|
|
|
case imageApex:
|
|
|
|
if buildFlattenedAsDefault {
|
|
|
|
a.suffix = imageApexSuffix
|
|
|
|
} else {
|
|
|
|
a.suffix = ""
|
|
|
|
a.primaryApexType = true
|
2019-12-05 08:27:44 +01:00
|
|
|
|
|
|
|
if ctx.Config().InstallExtraFlattenedApexes() {
|
2020-01-09 03:05:18 +01:00
|
|
|
a.externalDeps = append(a.externalDeps, a.Name()+flattenedSuffix)
|
2019-12-05 08:27:44 +01:00
|
|
|
}
|
2019-10-22 06:58:29 +02:00
|
|
|
}
|
|
|
|
case zipApex:
|
|
|
|
if proptools.String(a.properties.Payload_type) == "zip" {
|
|
|
|
a.suffix = ""
|
|
|
|
a.primaryApexType = true
|
|
|
|
} else {
|
|
|
|
a.suffix = zipApexSuffix
|
|
|
|
}
|
|
|
|
case flattenedApex:
|
|
|
|
if buildFlattenedAsDefault {
|
|
|
|
a.suffix = ""
|
|
|
|
a.primaryApexType = true
|
|
|
|
} else {
|
|
|
|
a.suffix = flattenedSuffix
|
|
|
|
}
|
2018-11-30 02:12:15 +01:00
|
|
|
}
|
|
|
|
|
2019-06-26 13:48:34 +02:00
|
|
|
if len(a.properties.Tests) > 0 && !a.testApex {
|
|
|
|
ctx.PropertyErrorf("tests", "property not allowed in apex module type")
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2019-01-30 03:31:59 +01:00
|
|
|
handleSpecialLibs := !android.Bool(a.properties.Ignore_system_library_special_case)
|
|
|
|
|
2019-08-01 10:41:43 +02:00
|
|
|
// native lib dependencies
|
|
|
|
var provideNativeLibs []string
|
|
|
|
var requireNativeLibs []string
|
|
|
|
|
2019-06-27 04:30:33 +02:00
|
|
|
// Check if "uses" requirements are met with dependent apexBundles
|
|
|
|
var providedNativeSharedLibs []string
|
|
|
|
useVendor := proptools.Bool(a.properties.Use_vendor)
|
|
|
|
ctx.VisitDirectDepsBlueprint(func(m blueprint.Module) {
|
|
|
|
if ctx.OtherModuleDependencyTag(m) != usesTag {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
otherName := ctx.OtherModuleName(m)
|
|
|
|
other, ok := m.(*apexBundle)
|
|
|
|
if !ok {
|
|
|
|
ctx.PropertyErrorf("uses", "%q is not a provider", otherName)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if proptools.Bool(other.properties.Use_vendor) != useVendor {
|
|
|
|
ctx.PropertyErrorf("use_vendor", "%q has different value of use_vendor", otherName)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if !proptools.Bool(other.properties.Provide_cpp_shared_libs) {
|
|
|
|
ctx.PropertyErrorf("uses", "%q does not provide native_shared_libs", otherName)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
providedNativeSharedLibs = append(providedNativeSharedLibs, other.properties.Native_shared_libs...)
|
|
|
|
})
|
|
|
|
|
2019-11-18 07:39:01 +01:00
|
|
|
var filesInfo []apexFile
|
2019-02-27 23:19:50 +01:00
|
|
|
ctx.WalkDepsBlueprint(func(child, parent blueprint.Module) bool {
|
2019-07-29 17:22:59 +02:00
|
|
|
depTag := ctx.OtherModuleDependencyTag(child)
|
|
|
|
depName := ctx.OtherModuleName(child)
|
2019-11-18 07:39:01 +01:00
|
|
|
if _, isDirectDep := parent.(*apexBundle); isDirectDep {
|
2018-10-10 07:01:00 +02:00
|
|
|
switch depTag {
|
|
|
|
case sharedLibTag:
|
|
|
|
if cc, ok := child.(*cc.Module); ok {
|
2019-08-01 10:41:43 +02:00
|
|
|
if cc.HasStubsVariants() {
|
|
|
|
provideNativeLibs = append(provideNativeLibs, cc.OutputFile().Path().Base())
|
|
|
|
}
|
2019-12-13 05:28:36 +01:00
|
|
|
filesInfo = append(filesInfo, apexFileForNativeLibrary(ctx, cc, handleSpecialLibs))
|
2019-11-18 07:39:01 +01:00
|
|
|
return true // track transitive dependencies
|
2018-10-12 14:49:38 +02:00
|
|
|
} else {
|
|
|
|
ctx.PropertyErrorf("native_shared_libs", "%q is not a cc_library or cc_library_shared module", depName)
|
2018-10-10 07:01:00 +02:00
|
|
|
}
|
|
|
|
case executableTag:
|
|
|
|
if cc, ok := child.(*cc.Module); ok {
|
2019-12-13 05:28:36 +01:00
|
|
|
filesInfo = append(filesInfo, apexFileForExecutable(ctx, cc))
|
2019-11-18 07:39:01 +01:00
|
|
|
return true // track transitive dependencies
|
2019-02-05 16:16:29 +01:00
|
|
|
} else if sh, ok := child.(*android.ShBinary); ok {
|
2019-12-13 05:28:36 +01:00
|
|
|
filesInfo = append(filesInfo, apexFileForShBinary(ctx, sh))
|
2019-02-27 23:19:50 +01:00
|
|
|
} else if py, ok := child.(*python.Module); ok && py.HostToolPath().Valid() {
|
2019-12-13 05:28:36 +01:00
|
|
|
filesInfo = append(filesInfo, apexFileForPyBinary(ctx, py))
|
2019-02-27 23:19:50 +01:00
|
|
|
} else if gb, ok := child.(bootstrap.GoBinaryTool); ok && a.Host() {
|
2019-11-18 07:39:01 +01:00
|
|
|
filesInfo = append(filesInfo, apexFileForGoBinary(ctx, depName, gb))
|
2018-10-12 14:49:38 +02:00
|
|
|
} else {
|
2019-02-27 23:19:50 +01:00
|
|
|
ctx.PropertyErrorf("binaries", "%q is neither cc_binary, (embedded) py_binary, (host) blueprint_go_binary, (host) bootstrap_go_binary, nor sh_binary", depName)
|
2018-10-10 07:01:00 +02:00
|
|
|
}
|
|
|
|
case javaLibTag:
|
2019-08-09 13:39:45 +02:00
|
|
|
if javaLib, ok := child.(*java.Library); ok {
|
2019-12-13 05:28:36 +01:00
|
|
|
af := apexFileForJavaLibrary(ctx, javaLib)
|
2019-11-18 07:39:01 +01:00
|
|
|
if !af.Ok() {
|
2018-11-07 18:50:25 +01:00
|
|
|
ctx.PropertyErrorf("java_libs", "%q is not configured to be compiled into dex", depName)
|
|
|
|
} else {
|
2019-11-18 07:39:01 +01:00
|
|
|
filesInfo = append(filesInfo, af)
|
|
|
|
return true // track transitive dependencies
|
2019-08-09 13:39:45 +02:00
|
|
|
}
|
2019-12-18 07:34:32 +01:00
|
|
|
} else if sdkLib, ok := child.(*java.SdkLibrary); ok {
|
|
|
|
af := apexFileForJavaLibrary(ctx, sdkLib)
|
|
|
|
if !af.Ok() {
|
|
|
|
ctx.PropertyErrorf("java_libs", "%q is not configured to be compiled into dex", depName)
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
filesInfo = append(filesInfo, af)
|
|
|
|
|
2019-12-24 10:38:06 +01:00
|
|
|
pf, _ := sdkLib.OutputFiles(".xml")
|
|
|
|
if len(pf) != 1 {
|
2019-12-18 07:34:32 +01:00
|
|
|
ctx.PropertyErrorf("java_libs", "%q failed to generate permission XML", depName)
|
|
|
|
return false
|
|
|
|
}
|
2019-12-24 10:38:06 +01:00
|
|
|
filesInfo = append(filesInfo, newApexFile(ctx, pf[0], pf[0].Base(), "etc/permissions", etc, nil))
|
2019-12-18 07:34:32 +01:00
|
|
|
return true // track transitive dependencies
|
2018-10-12 14:49:38 +02:00
|
|
|
} else {
|
2019-08-09 13:39:45 +02:00
|
|
|
ctx.PropertyErrorf("java_libs", "%q of type %q is not supported", depName, ctx.OtherModuleType(child))
|
2018-10-10 07:01:00 +02:00
|
|
|
}
|
2019-11-18 07:39:01 +01:00
|
|
|
case androidAppTag:
|
|
|
|
pkgName := ctx.DeviceConfig().OverridePackageNameFor(depName)
|
|
|
|
if ap, ok := child.(*java.AndroidApp); ok {
|
2019-12-13 05:28:36 +01:00
|
|
|
filesInfo = append(filesInfo, apexFileForAndroidApp(ctx, ap, pkgName))
|
2019-11-18 07:39:01 +01:00
|
|
|
return true // track transitive dependencies
|
|
|
|
} else if ap, ok := child.(*java.AndroidAppImport); ok {
|
2019-12-13 05:28:36 +01:00
|
|
|
filesInfo = append(filesInfo, apexFileForAndroidApp(ctx, ap, pkgName))
|
2019-12-20 23:58:03 +01:00
|
|
|
} else if ap, ok := child.(*java.AndroidTestHelperApp); ok {
|
|
|
|
filesInfo = append(filesInfo, apexFileForAndroidApp(ctx, ap, pkgName))
|
2019-11-18 07:39:01 +01:00
|
|
|
} else {
|
|
|
|
ctx.PropertyErrorf("apps", "%q is not an android_app module", depName)
|
|
|
|
}
|
2018-10-10 07:01:00 +02:00
|
|
|
case prebuiltTag:
|
2019-11-06 08:53:07 +01:00
|
|
|
if prebuilt, ok := child.(android.PrebuiltEtcModule); ok {
|
2019-12-13 05:28:36 +01:00
|
|
|
filesInfo = append(filesInfo, apexFileForPrebuiltEtc(ctx, prebuilt, depName))
|
2018-10-12 14:49:38 +02:00
|
|
|
} else {
|
|
|
|
ctx.PropertyErrorf("prebuilts", "%q is not a prebuilt_etc module", depName)
|
|
|
|
}
|
2019-06-26 13:48:34 +02:00
|
|
|
case testTag:
|
2019-07-29 17:22:59 +02:00
|
|
|
if ccTest, ok := child.(*cc.Module); ok {
|
|
|
|
if ccTest.IsTestPerSrcAllTestsVariation() {
|
|
|
|
// Multiple-output test module (where `test_per_src: true`).
|
|
|
|
//
|
|
|
|
// `ccTest` is the "" ("all tests") variation of a `test_per_src` module.
|
|
|
|
// We do not add this variation to `filesInfo`, as it has no output;
|
|
|
|
// however, we do add the other variations of this module as indirect
|
|
|
|
// dependencies (see below).
|
|
|
|
return true
|
2019-06-28 16:41:19 +02:00
|
|
|
} else {
|
2019-07-29 17:22:59 +02:00
|
|
|
// Single-output test module (where `test_per_src: false`).
|
2019-12-13 05:28:36 +01:00
|
|
|
af := apexFileForExecutable(ctx, ccTest)
|
2019-11-18 07:39:01 +01:00
|
|
|
af.class = nativeTest
|
|
|
|
filesInfo = append(filesInfo, af)
|
2019-06-28 16:41:19 +02:00
|
|
|
}
|
2019-06-26 13:48:34 +02:00
|
|
|
} else {
|
|
|
|
ctx.PropertyErrorf("tests", "%q is not a cc module", depName)
|
|
|
|
}
|
2018-10-12 14:49:38 +02:00
|
|
|
case keyTag:
|
|
|
|
if key, ok := child.(*apexKey); ok {
|
2019-02-18 07:25:04 +01:00
|
|
|
a.private_key_file = key.private_key_file
|
|
|
|
a.public_key_file = key.public_key_file
|
2018-10-12 14:49:38 +02:00
|
|
|
} else {
|
|
|
|
ctx.PropertyErrorf("key", "%q is not an apex_key module", depName)
|
2018-10-10 07:01:00 +02:00
|
|
|
}
|
2019-11-18 07:39:01 +01:00
|
|
|
return false
|
2018-10-30 13:20:05 +01:00
|
|
|
case certificateTag:
|
|
|
|
if dep, ok := child.(*java.AndroidAppCertificate); ok {
|
2019-02-18 07:25:04 +01:00
|
|
|
a.container_certificate_file = dep.Certificate.Pem
|
|
|
|
a.container_private_key_file = dep.Certificate.Key
|
2018-10-30 13:20:05 +01:00
|
|
|
} else {
|
|
|
|
ctx.ModuleErrorf("certificate dependency %q must be an android_app_certificate module", depName)
|
|
|
|
}
|
2019-07-26 16:20:40 +02:00
|
|
|
case android.PrebuiltDepTag:
|
|
|
|
// If the prebuilt is force disabled, remember to delete the prebuilt file
|
|
|
|
// that might have been installed in the previous builds
|
|
|
|
if prebuilt, ok := child.(*Prebuilt); ok && prebuilt.isForceDisabled() {
|
|
|
|
a.prebuiltFileToDelete = prebuilt.InstallFilename()
|
|
|
|
}
|
2018-10-10 07:01:00 +02:00
|
|
|
}
|
2019-10-28 21:08:31 +01:00
|
|
|
} else if !a.vndkApex {
|
2018-10-10 07:01:00 +02:00
|
|
|
// indirect dependencies
|
2019-08-20 10:30:57 +02:00
|
|
|
if am, ok := child.(android.ApexModule); ok {
|
2019-07-29 17:22:59 +02:00
|
|
|
// We cannot use a switch statement on `depTag` here as the checked
|
|
|
|
// tags used below are private (e.g. `cc.sharedDepTag`).
|
2019-11-11 02:14:32 +01:00
|
|
|
if cc.IsSharedDepTag(depTag) || cc.IsRuntimeDepTag(depTag) {
|
2019-07-29 17:22:59 +02:00
|
|
|
if cc, ok := child.(*cc.Module); ok {
|
|
|
|
if android.InList(cc.Name(), providedNativeSharedLibs) {
|
|
|
|
// If we're using a shared library which is provided from other APEX,
|
|
|
|
// don't include it in this APEX
|
|
|
|
return false
|
|
|
|
}
|
2019-12-17 04:47:13 +01:00
|
|
|
if !a.Host() && !android.DirectlyInApex(ctx.ModuleName(), ctx.OtherModuleName(cc)) && (cc.IsStubs() || cc.HasStubsVariants()) {
|
2019-07-29 17:22:59 +02:00
|
|
|
// If the dependency is a stubs lib, don't include it in this APEX,
|
|
|
|
// but make sure that the lib is installed on the device.
|
|
|
|
// In case no APEX is having the lib, the lib is installed to the system
|
|
|
|
// partition.
|
|
|
|
//
|
|
|
|
// Always include if we are a host-apex however since those won't have any
|
|
|
|
// system libraries.
|
2020-01-09 03:05:18 +01:00
|
|
|
if !android.DirectlyInAnyApex(ctx, cc.Name()) && !android.InList(cc.Name(), a.externalDeps) {
|
|
|
|
a.externalDeps = append(a.externalDeps, cc.Name())
|
2019-07-29 17:22:59 +02:00
|
|
|
}
|
2019-08-01 10:41:43 +02:00
|
|
|
requireNativeLibs = append(requireNativeLibs, cc.OutputFile().Path().Base())
|
2019-07-29 17:22:59 +02:00
|
|
|
// Don't track further
|
|
|
|
return false
|
2019-02-20 13:49:26 +01:00
|
|
|
}
|
2019-12-13 05:28:36 +01:00
|
|
|
af := apexFileForNativeLibrary(ctx, cc, handleSpecialLibs)
|
2019-11-18 07:39:01 +01:00
|
|
|
af.transitiveDep = true
|
|
|
|
filesInfo = append(filesInfo, af)
|
|
|
|
return true // track transitive dependencies
|
Stubs variant is used when building for APEX
When a native module is built for an APEX and is depending on a native
library having stubs (i.e. stubs.versions property is set), the stubs
variant is used unless the dependent lib is directly included in the
same APEX with the depending module.
Example:
apex {
name: "myapex",
native_shared_libs: ["libX", "libY"],
}
cc_library {
name: "libX",
shared_libs: ["libY", "libZ"],
}
cc_library {
name: "libY",
stubs: { versions: ["1", "2"], },
}
cc_library {
name: "libZ",
stubs: { versions: ["1", "2"], },
}
In this case, libX is linking to the impl variant of libY (that provides
private APIs) while libY is linking to the version 2 stubs of libZ. This is
because libY is directly included in the same apex via
native_shared_libs property, but libZ isn't.
Bug: 112672359
Test: apex_test added
Change-Id: If9871b70dc74a06bd828dd4cd1aeebd2e68b837c
2018-11-18 10:02:45 +01:00
|
|
|
}
|
2019-07-29 17:22:59 +02:00
|
|
|
} else if cc.IsTestPerSrcDepTag(depTag) {
|
|
|
|
if cc, ok := child.(*cc.Module); ok {
|
2019-12-13 05:28:36 +01:00
|
|
|
af := apexFileForExecutable(ctx, cc)
|
2019-07-29 17:22:59 +02:00
|
|
|
// Handle modules created as `test_per_src` variations of a single test module:
|
|
|
|
// use the name of the generated test binary (`fileToCopy`) instead of the name
|
|
|
|
// of the original test module (`depName`, shared by all `test_per_src`
|
|
|
|
// variations of that module).
|
2019-11-18 07:39:01 +01:00
|
|
|
af.moduleName = filepath.Base(af.builtFile.String())
|
|
|
|
af.transitiveDep = true
|
|
|
|
filesInfo = append(filesInfo, af)
|
|
|
|
return true // track transitive dependencies
|
2019-07-29 17:22:59 +02:00
|
|
|
}
|
2019-11-11 02:14:32 +01:00
|
|
|
} else if java.IsJniDepTag(depTag) {
|
2020-01-09 03:05:18 +01:00
|
|
|
// Do nothing for JNI dep. JNI libraries are always embedded in APK-in-APEX.
|
2019-11-18 07:39:01 +01:00
|
|
|
return true
|
2019-08-20 10:30:57 +02:00
|
|
|
} else if am.CanHaveApexVariants() && am.IsInstallableToApex() {
|
2019-07-29 17:22:59 +02:00
|
|
|
ctx.ModuleErrorf("unexpected tag %q for indirect dependency %q", depTag, depName)
|
2018-10-10 07:01:00 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
})
|
|
|
|
|
2019-11-08 11:51:01 +01:00
|
|
|
// Specific to the ART apex: dexpreopt artifacts for libcore Java libraries.
|
|
|
|
// Build rules are generated by the dexpreopt singleton, and here we access build artifacts
|
|
|
|
// via the global boot image config.
|
|
|
|
if a.artApex {
|
|
|
|
for arch, files := range java.DexpreoptedArtApexJars(ctx) {
|
|
|
|
dirInApex := filepath.Join("javalib", arch.String())
|
|
|
|
for _, f := range files {
|
|
|
|
localModule := "javalib_" + arch.String() + "_" + filepath.Base(f.String())
|
2019-12-13 05:28:36 +01:00
|
|
|
af := newApexFile(ctx, f, localModule, dirInApex, etc, nil)
|
2019-11-18 07:39:01 +01:00
|
|
|
filesInfo = append(filesInfo, af)
|
2019-11-08 11:51:01 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-18 07:25:04 +01:00
|
|
|
if a.private_key_file == nil {
|
2018-11-08 21:52:26 +01:00
|
|
|
ctx.PropertyErrorf("key", "private_key for %q could not be found", String(a.properties.Key))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2018-11-07 18:50:25 +01:00
|
|
|
// remove duplicates in filesInfo
|
|
|
|
removeDup := func(filesInfo []apexFile) []apexFile {
|
2019-08-23 04:17:39 +02:00
|
|
|
encountered := make(map[string]bool)
|
2018-11-07 18:50:25 +01:00
|
|
|
result := []apexFile{}
|
|
|
|
for _, f := range filesInfo {
|
2019-08-23 04:17:39 +02:00
|
|
|
dest := filepath.Join(f.installDir, f.builtFile.Base())
|
|
|
|
if !encountered[dest] {
|
|
|
|
encountered[dest] = true
|
2018-11-07 18:50:25 +01:00
|
|
|
result = append(result, f)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return result
|
|
|
|
}
|
|
|
|
filesInfo = removeDup(filesInfo)
|
|
|
|
|
|
|
|
// to have consistent build rules
|
|
|
|
sort.Slice(filesInfo, func(i, j int) bool {
|
|
|
|
return filesInfo[i].builtFile.String() < filesInfo[j].builtFile.String()
|
|
|
|
})
|
|
|
|
|
Add apex_available to control the availablity of a module to APEXes
apex_available property controls the availability of a module to APEXes.
For example, `apex_available: ["myapex", "otherapex"]` makes the module
available only to the two APEXes: myapex and otherapex, and nothing
else, even to the platform.
If the module is intended to be available to any APEX, then a pseudo
name "//apex_available:anyapex" can be used.
If the module is intended to be available to the platform, then another
pseudo name "//apex_available:platform" is used.
For now, if unspecified, this property defaults to ["//apex_available:platform",
"//apex_available:anyapex"], which means the module is available to everybody.
This will be reduced to ["//apex_available:platform"], when marking for
apex_available for existing modules are finished.
Bug: 139870423
Bug: 128708192
Test: m
Change-Id: Id4b233c3056c7858f984cbf9427cfac4118b2682
2019-09-30 09:04:35 +02:00
|
|
|
// check apex_available requirements
|
2019-12-02 05:08:53 +01:00
|
|
|
if !ctx.Host() && !a.testApex {
|
2019-10-08 13:55:38 +02:00
|
|
|
for _, fi := range filesInfo {
|
|
|
|
if am, ok := fi.module.(android.ApexModule); ok {
|
|
|
|
if !am.AvailableFor(ctx.ModuleName()) {
|
|
|
|
ctx.ModuleErrorf("requires %q that is not available for the APEX", fi.module.Name())
|
2019-12-02 05:08:53 +01:00
|
|
|
// don't stop so that we can report other violations in the same run
|
2019-10-08 13:55:38 +02:00
|
|
|
}
|
Add apex_available to control the availablity of a module to APEXes
apex_available property controls the availability of a module to APEXes.
For example, `apex_available: ["myapex", "otherapex"]` makes the module
available only to the two APEXes: myapex and otherapex, and nothing
else, even to the platform.
If the module is intended to be available to any APEX, then a pseudo
name "//apex_available:anyapex" can be used.
If the module is intended to be available to the platform, then another
pseudo name "//apex_available:platform" is used.
For now, if unspecified, this property defaults to ["//apex_available:platform",
"//apex_available:anyapex"], which means the module is available to everybody.
This will be reduced to ["//apex_available:platform"], when marking for
apex_available for existing modules are finished.
Bug: 139870423
Bug: 128708192
Test: m
Change-Id: Id4b233c3056c7858f984cbf9427cfac4118b2682
2019-09-30 09:04:35 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-11-07 18:50:25 +01:00
|
|
|
// prepend the name of this APEX to the module names. These names will be the names of
|
|
|
|
// modules that will be defined if the APEX is flattened.
|
|
|
|
for i := range filesInfo {
|
2019-11-22 23:50:42 +01:00
|
|
|
filesInfo[i].moduleName = filesInfo[i].moduleName + "." + a.Name() + a.suffix
|
2018-11-07 18:50:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
a.installDir = android.PathForModuleInstall(ctx, "apex")
|
|
|
|
a.filesInfo = filesInfo
|
2018-11-30 02:12:15 +01:00
|
|
|
|
2019-11-19 18:26:02 +01:00
|
|
|
if a.properties.ApexType != zipApex {
|
|
|
|
if a.properties.File_contexts == nil {
|
|
|
|
a.fileContexts = android.PathForSource(ctx, "system/sepolicy/apex", ctx.ModuleName()+"-file_contexts")
|
|
|
|
} else {
|
|
|
|
a.fileContexts = android.PathForModuleSrc(ctx, *a.properties.File_contexts)
|
|
|
|
if a.Platform() {
|
|
|
|
if matched, err := path.Match("system/sepolicy/**/*", a.fileContexts.String()); err != nil || !matched {
|
|
|
|
ctx.PropertyErrorf("file_contexts", "should be under system/sepolicy, but %q", a.fileContexts)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if !android.ExistentPathForSource(ctx, a.fileContexts.String()).Valid() {
|
|
|
|
ctx.PropertyErrorf("file_contexts", "cannot find file_contexts file: %q", a.fileContexts)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-09-26 17:38:03 +02:00
|
|
|
// prepare apex_manifest.json
|
2019-11-01 18:52:25 +01:00
|
|
|
a.buildManifest(ctx, provideNativeLibs, requireNativeLibs)
|
|
|
|
|
|
|
|
a.setCertificateAndPrivateKey(ctx)
|
|
|
|
if a.properties.ApexType == flattenedApex {
|
|
|
|
a.buildFlattenedApex(ctx)
|
|
|
|
} else {
|
|
|
|
a.buildUnflattenedApex(ctx)
|
|
|
|
}
|
|
|
|
|
2020-01-07 17:57:58 +01:00
|
|
|
a.compatSymlinks = makeCompatSymlinks(a.BaseModuleName(), ctx)
|
2019-11-01 18:52:25 +01:00
|
|
|
}
|
|
|
|
|
2019-08-23 04:17:39 +02:00
|
|
|
func newApexBundle() *apexBundle {
|
2019-10-22 06:58:29 +02:00
|
|
|
module := &apexBundle{}
|
2018-10-10 07:01:00 +02:00
|
|
|
module.AddProperties(&module.properties)
|
2019-01-30 03:07:33 +01:00
|
|
|
module.AddProperties(&module.targetProperties)
|
2019-11-15 10:40:32 +01:00
|
|
|
module.AddProperties(&module.overridableProperties)
|
2018-11-30 02:12:15 +01:00
|
|
|
module.Prefer32(func(ctx android.BaseModuleContext, base *android.ModuleBase, class android.OsClass) bool {
|
binaries and native_shared_libraires are multilib-aware props
The properties 'binaries' and 'native_shared_libraries' can be
multilib-aware, i.e, can be under multilib.type where type can be either
first, both, lib32, lib64, or prefer32.
Native modules listed in multilib.first are installed only for the first
ABI of the device. Similarily, multilib.both are for both of the ABIs,
while multilib.lib32 and multilib.lib64 are 32 and 64-bit ABI only,
respectively. multilib.prefer32 is for 32-bit only when 32-bit ABI is
available.
Another change is that the binaries property, when not within multilib,
targets only the first ABI.
Test: m apex.test on ...
1) aosp_arm64 without TARGET_PREFER_32_BIT_EXECUTABLES=true
2) aosp_arm64 with TARGET_PREFER_32_BIT_EXECUTABLES=true
3) aosp_arm
in all cases, vold, surfaceflinger and drmserver are all intalled under
./bin directory of the APEX. And native libraries are installed under
both ./lib and ./lib64 directories in the case of 1) and 2).
Change-Id: Idd7f8526a61bceca89d43c0c69ccedb471b67d31
2018-10-24 14:09:55 +02:00
|
|
|
return class == android.Device && ctx.Config().DevicePrefer32BitExecutables()
|
|
|
|
})
|
2018-11-30 02:12:15 +01:00
|
|
|
android.InitAndroidMultiTargetsArchModule(module, android.HostAndDeviceSupported, android.MultilibCommon)
|
2018-10-10 07:01:00 +02:00
|
|
|
android.InitDefaultableModule(module)
|
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 13:08:41 +02:00
|
|
|
android.InitSdkAwareModule(module)
|
2019-12-20 02:32:06 +01:00
|
|
|
android.InitOverridableModule(module, &module.overridableProperties.Overrides)
|
2018-10-10 07:01:00 +02:00
|
|
|
return module
|
|
|
|
}
|
2019-02-07 08:27:23 +01:00
|
|
|
|
2019-11-08 11:51:01 +01:00
|
|
|
func ApexBundleFactory(testApex bool, artApex bool) android.Module {
|
2019-08-23 04:17:39 +02:00
|
|
|
bundle := newApexBundle()
|
|
|
|
bundle.testApex = testApex
|
2019-11-08 11:51:01 +01:00
|
|
|
bundle.artApex = artApex
|
2019-08-23 04:17:39 +02:00
|
|
|
return bundle
|
|
|
|
}
|
|
|
|
|
|
|
|
func testApexBundleFactory() android.Module {
|
|
|
|
bundle := newApexBundle()
|
|
|
|
bundle.testApex = true
|
|
|
|
return bundle
|
|
|
|
}
|
|
|
|
|
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 13:08:41 +02:00
|
|
|
func BundleFactory() android.Module {
|
2019-08-23 04:17:39 +02:00
|
|
|
return newApexBundle()
|
|
|
|
}
|
|
|
|
|
2019-02-07 08:27:23 +01:00
|
|
|
//
|
|
|
|
// Defaults
|
|
|
|
//
|
|
|
|
type Defaults struct {
|
|
|
|
android.ModuleBase
|
|
|
|
android.DefaultsModuleBase
|
|
|
|
}
|
|
|
|
|
|
|
|
func defaultsFactory() android.Module {
|
|
|
|
return DefaultsFactory()
|
|
|
|
}
|
|
|
|
|
|
|
|
func DefaultsFactory(props ...interface{}) android.Module {
|
|
|
|
module := &Defaults{}
|
|
|
|
|
|
|
|
module.AddProperties(props...)
|
|
|
|
module.AddProperties(
|
|
|
|
&apexBundleProperties{},
|
|
|
|
&apexTargetBundleProperties{},
|
2019-12-16 14:32:06 +01:00
|
|
|
&overridableProperties{},
|
2019-02-07 08:27:23 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
android.InitDefaultsModule(module)
|
|
|
|
return module
|
|
|
|
}
|
2019-11-15 10:40:32 +01:00
|
|
|
|
|
|
|
//
|
|
|
|
// OverrideApex
|
|
|
|
//
|
|
|
|
type OverrideApex struct {
|
|
|
|
android.ModuleBase
|
|
|
|
android.OverrideModuleBase
|
|
|
|
}
|
|
|
|
|
|
|
|
func (o *OverrideApex) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
|
|
|
// All the overrides happen in the base module.
|
|
|
|
}
|
|
|
|
|
|
|
|
// override_apex is used to create an apex module based on another apex module
|
|
|
|
// by overriding some of its properties.
|
|
|
|
func overrideApexFactory() android.Module {
|
|
|
|
m := &OverrideApex{}
|
|
|
|
m.AddProperties(&overridableProperties{})
|
|
|
|
|
|
|
|
android.InitAndroidMultiTargetsArchModule(m, android.DeviceSupported, android.MultilibCommon)
|
|
|
|
android.InitOverrideModule(m)
|
|
|
|
return m
|
|
|
|
}
|