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"
|
|
|
|
"io"
|
|
|
|
"path/filepath"
|
|
|
|
"runtime"
|
2018-10-10 07:05:29 +02:00
|
|
|
"sort"
|
2018-10-10 07:01:00 +02:00
|
|
|
"strings"
|
|
|
|
|
|
|
|
"android/soong/android"
|
|
|
|
"android/soong/cc"
|
|
|
|
"android/soong/java"
|
|
|
|
|
|
|
|
"github.com/google/blueprint"
|
|
|
|
"github.com/google/blueprint/proptools"
|
|
|
|
)
|
|
|
|
|
|
|
|
var (
|
|
|
|
pctx = android.NewPackageContext("android/apex")
|
|
|
|
|
|
|
|
// Create a canned fs config file where all files and directories are
|
|
|
|
// by default set to (uid/gid/mode) = (1000/1000/0644)
|
|
|
|
// TODO(b/113082813) make this configurable using config.fs syntax
|
|
|
|
generateFsConfig = pctx.StaticRule("generateFsConfig", blueprint.RuleParams{
|
2018-11-02 12:50:42 +01:00
|
|
|
Command: `echo '/ 1000 1000 0755' > ${out} && ` +
|
2018-11-20 19:04:58 +01:00
|
|
|
`echo '/apex_manifest.json 1000 1000 0644' >> ${out} && ` +
|
2018-10-11 06:23:09 +02:00
|
|
|
`echo ${ro_paths} | tr ' ' '\n' | awk '{print "/"$$1 " 1000 1000 0644"}' >> ${out} && ` +
|
2019-01-08 06:04:17 +01:00
|
|
|
`echo ${exec_paths} | tr ' ' '\n' | awk '{print "/"$$1 " 0 2000 0755"}' >> ${out}`,
|
2018-10-10 07:01:00 +02:00
|
|
|
Description: "fs_config ${out}",
|
2018-10-11 06:23:09 +02:00
|
|
|
}, "ro_paths", "exec_paths")
|
2018-10-10 07:01:00 +02:00
|
|
|
|
|
|
|
// TODO(b/113233103): make sure that file_contexts is sane, i.e., validate
|
|
|
|
// against the binary policy using sefcontext_compiler -p <policy>.
|
|
|
|
|
|
|
|
// TODO(b/114327326): automate the generation of file_contexts
|
|
|
|
apexRule = pctx.StaticRule("apexRule", blueprint.RuleParams{
|
|
|
|
Command: `rm -rf ${image_dir} && mkdir -p ${image_dir} && ` +
|
|
|
|
`(${copy_commands}) && ` +
|
|
|
|
`APEXER_TOOL_PATH=${tool_path} ` +
|
2018-11-20 01:57:52 +01:00
|
|
|
`${apexer} --force --manifest ${manifest} ` +
|
2018-10-10 07:01:00 +02:00
|
|
|
`--file_contexts ${file_contexts} ` +
|
|
|
|
`--canned_fs_config ${canned_fs_config} ` +
|
2018-11-30 02:12:15 +01:00
|
|
|
`--payload_type image ` +
|
2018-12-27 08:04:18 +01:00
|
|
|
`--key ${key} ${opt_flags} ${image_dir} ${out} `,
|
2018-10-10 07:01:00 +02:00
|
|
|
CommandDeps: []string{"${apexer}", "${avbtool}", "${e2fsdroid}", "${merge_zips}",
|
|
|
|
"${mke2fs}", "${resize2fs}", "${sefcontext_compile}",
|
|
|
|
"${soong_zip}", "${zipalign}", "${aapt2}"},
|
|
|
|
Description: "APEX ${image_dir} => ${out}",
|
2018-12-27 08:04:18 +01:00
|
|
|
}, "tool_path", "image_dir", "copy_commands", "manifest", "file_contexts", "canned_fs_config", "key", "opt_flags")
|
2018-11-16 20:36:28 +01:00
|
|
|
|
2018-11-30 02:12:15 +01:00
|
|
|
zipApexRule = pctx.StaticRule("zipApexRule", blueprint.RuleParams{
|
|
|
|
Command: `rm -rf ${image_dir} && mkdir -p ${image_dir} && ` +
|
|
|
|
`(${copy_commands}) && ` +
|
|
|
|
`APEXER_TOOL_PATH=${tool_path} ` +
|
|
|
|
`${apexer} --force --manifest ${manifest} ` +
|
|
|
|
`--payload_type zip ` +
|
|
|
|
`${image_dir} ${out} `,
|
|
|
|
CommandDeps: []string{"${apexer}", "${merge_zips}", "${soong_zip}", "${zipalign}", "${aapt2}"},
|
|
|
|
Description: "ZipAPEX ${image_dir} => ${out}",
|
|
|
|
}, "tool_path", "image_dir", "copy_commands", "manifest")
|
|
|
|
|
2018-11-16 20:36:28 +01:00
|
|
|
apexProtoConvertRule = pctx.AndroidStaticRule("apexProtoConvertRule",
|
|
|
|
blueprint.RuleParams{
|
|
|
|
Command: `${aapt2} convert --output-format proto $in -o $out`,
|
|
|
|
CommandDeps: []string{"${aapt2}"},
|
|
|
|
})
|
|
|
|
|
|
|
|
apexBundleRule = pctx.StaticRule("apexBundleRule", blueprint.RuleParams{
|
2018-11-23 05:22:21 +01:00
|
|
|
Command: `${zip2zip} -i $in -o $out ` +
|
2018-11-20 19:04:58 +01:00
|
|
|
`apex_payload.img:apex/${abi}.img ` +
|
|
|
|
`apex_manifest.json:root/apex_manifest.json ` +
|
2018-11-26 15:12:02 +01:00
|
|
|
`AndroidManifest.xml:manifest/AndroidManifest.xml`,
|
2018-11-16 20:36:28 +01:00
|
|
|
CommandDeps: []string{"${zip2zip}"},
|
|
|
|
Description: "app bundle",
|
|
|
|
}, "abi")
|
2018-10-10 07:01:00 +02:00
|
|
|
)
|
|
|
|
|
2018-11-30 02:12:15 +01:00
|
|
|
var imageApexSuffix = ".apex"
|
|
|
|
var zipApexSuffix = ".zipapex"
|
|
|
|
|
|
|
|
var imageApexType = "image"
|
|
|
|
var zipApexType = "zip"
|
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"}
|
|
|
|
keyTag = dependencyTag{name: "key"}
|
|
|
|
certificateTag = dependencyTag{name: "certificate"}
|
2018-10-10 07:01:00 +02:00
|
|
|
)
|
|
|
|
|
|
|
|
func init() {
|
|
|
|
pctx.Import("android/soong/common")
|
2018-10-30 13:20:05 +01:00
|
|
|
pctx.Import("android/soong/java")
|
2018-10-10 07:01:00 +02:00
|
|
|
pctx.HostBinToolVariable("apexer", "apexer")
|
2018-10-05 20:34:32 +02:00
|
|
|
// ART minimal builds (using the master-art manifest) do not have the "frameworks/base"
|
|
|
|
// projects, and hence cannot built 'aapt2'. Use the SDK prebuilt instead.
|
|
|
|
hostBinToolVariableWithPrebuilt := func(name, prebuiltDir, tool string) {
|
|
|
|
pctx.VariableFunc(name, func(ctx android.PackageVarContext) string {
|
2019-01-23 22:04:05 +01:00
|
|
|
if !ctx.Config().FrameworksBaseDirExists(ctx) {
|
2018-10-05 20:34:32 +02:00
|
|
|
return filepath.Join(prebuiltDir, runtime.GOOS, "bin", tool)
|
|
|
|
} else {
|
|
|
|
return pctx.HostBinToolPath(ctx, tool).String()
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
hostBinToolVariableWithPrebuilt("aapt2", "prebuilts/sdk/tools", "aapt2")
|
2018-10-10 07:01:00 +02:00
|
|
|
pctx.HostBinToolVariable("avbtool", "avbtool")
|
|
|
|
pctx.HostBinToolVariable("e2fsdroid", "e2fsdroid")
|
|
|
|
pctx.HostBinToolVariable("merge_zips", "merge_zips")
|
|
|
|
pctx.HostBinToolVariable("mke2fs", "mke2fs")
|
|
|
|
pctx.HostBinToolVariable("resize2fs", "resize2fs")
|
|
|
|
pctx.HostBinToolVariable("sefcontext_compile", "sefcontext_compile")
|
|
|
|
pctx.HostBinToolVariable("soong_zip", "soong_zip")
|
2018-11-16 20:36:28 +01:00
|
|
|
pctx.HostBinToolVariable("zip2zip", "zip2zip")
|
2018-10-10 07:01:00 +02:00
|
|
|
pctx.HostBinToolVariable("zipalign", "zipalign")
|
|
|
|
|
2019-02-07 22:20:53 +01:00
|
|
|
android.RegisterModuleType("apex", apexBundleFactory)
|
|
|
|
android.RegisterModuleType("apex_test", testApexBundleFactory)
|
2019-02-07 08:27:23 +01:00
|
|
|
android.RegisterModuleType("apex_defaults", defaultsFactory)
|
2018-10-10 07:01:00 +02:00
|
|
|
|
|
|
|
android.PostDepsMutators(func(ctx android.RegisterMutatorsContext) {
|
|
|
|
ctx.TopDown("apex_deps", apexDepsMutator)
|
|
|
|
ctx.BottomUp("apex", apexMutator)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
// Mark the direct and transitive dependencies of apex bundles so that they
|
|
|
|
// can be built for the apex bundles.
|
|
|
|
func apexDepsMutator(mctx android.TopDownMutatorContext) {
|
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
|
|
|
|
2018-10-10 07:01:00 +02:00
|
|
|
if am, ok := child.(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.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)
|
2018-10-10 07:01:00 +02:00
|
|
|
} else if _, ok := mctx.Module().(*apexBundle); ok {
|
|
|
|
// apex bundle itself is mutated so that it and its modules have same
|
|
|
|
// apex variant.
|
|
|
|
apexBundleName := mctx.ModuleName()
|
|
|
|
mctx.CreateVariations(apexBundleName)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-01-30 03:07:33 +01:00
|
|
|
type apexNativeDependencies struct {
|
|
|
|
// List of native libraries
|
|
|
|
Native_shared_libs []string
|
|
|
|
// List of native executables
|
|
|
|
Binaries []string
|
|
|
|
}
|
|
|
|
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"
|
2018-10-10 07:01:00 +02:00
|
|
|
Manifest *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.
|
|
|
|
// Specifically, when this is set to <value>, /system/sepolicy/apex/<value>_file_contexts file is
|
|
|
|
// used.
|
|
|
|
// Default: <name_of_this_module>
|
2018-10-10 07:01:00 +02:00
|
|
|
File_contexts *string
|
|
|
|
|
|
|
|
// List of native shared libs that are embedded inside this APEX bundle
|
|
|
|
Native_shared_libs []string
|
|
|
|
|
|
|
|
// List of native executables that are embedded inside this APEX bundle
|
|
|
|
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
|
|
|
|
|
|
|
// 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
|
|
|
|
}
|
|
|
|
|
|
|
|
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-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-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-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
|
|
|
}
|
|
|
|
|
2018-11-07 18:50:25 +01:00
|
|
|
type apexFileClass int
|
|
|
|
|
|
|
|
const (
|
|
|
|
etc apexFileClass = iota
|
|
|
|
nativeSharedLib
|
|
|
|
nativeExecutable
|
2019-02-05 16:16:29 +01:00
|
|
|
shBinary
|
2018-11-07 18:50:25 +01:00
|
|
|
javaSharedLib
|
|
|
|
)
|
|
|
|
|
2018-11-30 02:12:15 +01:00
|
|
|
type apexPackaging int
|
|
|
|
|
|
|
|
const (
|
|
|
|
imageApex apexPackaging = iota
|
|
|
|
zipApex
|
|
|
|
both
|
|
|
|
)
|
|
|
|
|
|
|
|
func (a apexPackaging) image() bool {
|
|
|
|
switch a {
|
|
|
|
case imageApex, both:
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
func (a apexPackaging) zip() bool {
|
|
|
|
switch a {
|
|
|
|
case zipApex, both:
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
func (a apexPackaging) suffix() string {
|
|
|
|
switch a {
|
|
|
|
case imageApex:
|
|
|
|
return imageApexSuffix
|
|
|
|
case zipApex:
|
|
|
|
return zipApexSuffix
|
|
|
|
case both:
|
|
|
|
panic(fmt.Errorf("must be either zip or image"))
|
|
|
|
default:
|
|
|
|
panic(fmt.Errorf("unkonwn APEX type %d", a))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (a apexPackaging) name() string {
|
|
|
|
switch a {
|
|
|
|
case imageApex:
|
|
|
|
return imageApexType
|
|
|
|
case zipApex:
|
|
|
|
return zipApexType
|
|
|
|
case both:
|
|
|
|
panic(fmt.Errorf("must be either zip or image"))
|
|
|
|
default:
|
|
|
|
panic(fmt.Errorf("unkonwn APEX type %d", a))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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-05 16:16:29 +01:00
|
|
|
case nativeExecutable, shBinary:
|
2018-11-07 18:50:25 +01:00
|
|
|
return "EXECUTABLES"
|
|
|
|
case javaSharedLib:
|
|
|
|
return "JAVA_LIBRARIES"
|
|
|
|
default:
|
|
|
|
panic(fmt.Errorf("unkonwn class %d", class))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
type apexFile struct {
|
|
|
|
builtFile android.Path
|
|
|
|
moduleName string
|
|
|
|
installDir string
|
|
|
|
class apexFileClass
|
2018-12-19 09:36:39 +01:00
|
|
|
module android.Module
|
2019-01-18 23:37:31 +01:00
|
|
|
symlinks []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-01-30 03:07:33 +01:00
|
|
|
properties apexBundleProperties
|
|
|
|
targetProperties apexTargetBundleProperties
|
2018-10-10 07:01:00 +02:00
|
|
|
|
2018-11-30 02:12:15 +01:00
|
|
|
apexTypes apexPackaging
|
|
|
|
|
2018-11-16 20:36:28 +01:00
|
|
|
bundleModuleFile android.WritablePath
|
2018-11-30 02:12:15 +01:00
|
|
|
outputFiles map[apexPackaging]android.WritablePath
|
2018-11-16 20:36:28 +01:00
|
|
|
installDir android.OutputPath
|
2018-11-07 18:50:25 +01:00
|
|
|
|
|
|
|
// list of files to be included in this apex
|
|
|
|
filesInfo []apexFile
|
|
|
|
|
|
|
|
flattened bool
|
2019-02-07 22:20:53 +01:00
|
|
|
|
|
|
|
testApex bool
|
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,
|
2018-12-19 09:12:36 +01:00
|
|
|
native_shared_libs []string, binaries []string, arch string, 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.
|
|
|
|
ctx.AddFarVariationDependencies([]blueprint.Variation{
|
|
|
|
{Mutator: "arch", Variation: arch},
|
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
|
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
|
|
|
}, sharedLibTag, native_shared_libs...)
|
|
|
|
|
|
|
|
ctx.AddFarVariationDependencies([]blueprint.Variation{
|
|
|
|
{Mutator: "arch", Variation: arch},
|
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
|
|
|
}, executableTag, binaries...)
|
|
|
|
}
|
|
|
|
|
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-01-30 03:07:33 +01: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
|
|
|
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.
|
2018-10-10 07:01:00 +02:00
|
|
|
ctx.AddFarVariationDependencies([]blueprint.Variation{
|
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: "arch", Variation: target.String()},
|
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"},
|
|
|
|
}, sharedLibTag, a.properties.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
|
|
|
// Add native modules targetting both ABIs
|
|
|
|
addDependenciesForNativeModules(ctx,
|
|
|
|
a.properties.Multilib.Both.Native_shared_libs,
|
2018-12-19 09:12:36 +01:00
|
|
|
a.properties.Multilib.Both.Binaries, target.String(),
|
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.
|
|
|
|
ctx.AddFarVariationDependencies([]blueprint.Variation{
|
|
|
|
{Mutator: "arch", Variation: target.String()},
|
2019-01-05 03:15:24 +01:00
|
|
|
{Mutator: "image", Variation: 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
|
|
|
}, executableTag, a.properties.Binaries...)
|
|
|
|
|
|
|
|
// Add native modules targetting the first ABI
|
|
|
|
addDependenciesForNativeModules(ctx,
|
|
|
|
a.properties.Multilib.First.Native_shared_libs,
|
2018-12-19 09:12:36 +01:00
|
|
|
a.properties.Multilib.First.Binaries, target.String(),
|
2019-01-05 03:15:24 +01:00
|
|
|
a.getImageVariation(config))
|
2019-01-15 19:47:05 +01:00
|
|
|
|
|
|
|
// When multilib.* is omitted for prebuilts, it implies multilib.first.
|
|
|
|
ctx.AddFarVariationDependencies([]blueprint.Variation{
|
|
|
|
{Mutator: "arch", Variation: target.String()},
|
|
|
|
}, prebuiltTag, a.properties.Prebuilts...)
|
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,
|
2018-12-19 09:12:36 +01:00
|
|
|
a.properties.Multilib.Lib32.Binaries, target.String(),
|
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,
|
2018-12-19 09:12:36 +01:00
|
|
|
a.properties.Multilib.Prefer32.Binaries, target.String(),
|
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,
|
2018-12-19 09:12:36 +01:00
|
|
|
a.properties.Multilib.Lib64.Binaries, target.String(),
|
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,
|
2018-12-19 09:12:36 +01:00
|
|
|
a.properties.Multilib.Prefer32.Binaries, target.String(),
|
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
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-10-12 14:49:38 +02:00
|
|
|
}
|
2018-10-10 07:01:00 +02:00
|
|
|
|
2018-10-12 14:49:38 +02:00
|
|
|
ctx.AddFarVariationDependencies([]blueprint.Variation{
|
|
|
|
{Mutator: "arch", Variation: "android_common"},
|
|
|
|
}, javaLibTag, a.properties.Java_libs...)
|
2018-10-10 07:01:00 +02:00
|
|
|
|
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-02 05:13:47 +01:00
|
|
|
cert := android.SrcIsModule(String(a.properties.Certificate))
|
|
|
|
if cert != "" {
|
|
|
|
ctx.AddDependency(ctx.Module(), certificateTag, cert)
|
2018-10-30 13:20:05 +01:00
|
|
|
}
|
2018-10-10 07:01:00 +02:00
|
|
|
}
|
|
|
|
|
2018-11-27 13:27:08 +01:00
|
|
|
func (a *apexBundle) Srcs() android.Paths {
|
2018-12-20 01:54:35 +01:00
|
|
|
if file, ok := a.outputFiles[imageApex]; ok {
|
|
|
|
return android.Paths{file}
|
|
|
|
} else {
|
|
|
|
return nil
|
|
|
|
}
|
2018-11-27 13:27:08 +01:00
|
|
|
}
|
|
|
|
|
2018-12-13 15:14:57 +01:00
|
|
|
func (a *apexBundle) installable() bool {
|
|
|
|
return a.properties.Installable == nil || proptools.Bool(a.properties.Installable)
|
|
|
|
}
|
|
|
|
|
2019-01-05 03:15:24 +01:00
|
|
|
func (a *apexBundle) getImageVariation(config android.DeviceConfig) string {
|
|
|
|
if config.VndkVersion() != "" && proptools.Bool(a.properties.Use_vendor) {
|
2018-12-19 09:12:36 +01:00
|
|
|
return "vendor"
|
|
|
|
} else {
|
|
|
|
return "core"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-01-28 11:47:32 +01:00
|
|
|
func (a *apexBundle) IsSanitizerEnabled(ctx android.BaseModuleContext, sanitizerName string) bool {
|
|
|
|
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-01-30 03:31:59 +01:00
|
|
|
func getCopyManifestForNativeLibrary(cc *cc.Module, handleSpecialLibs bool) (fileToCopy android.Path, dirInApex string) {
|
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.
|
|
|
|
switch cc.Arch().ArchType.Multilib {
|
|
|
|
case "lib32":
|
|
|
|
dirInApex = "lib"
|
|
|
|
case "lib64":
|
|
|
|
dirInApex = "lib64"
|
|
|
|
}
|
2019-02-01 04:03:59 +01:00
|
|
|
dirInApex = filepath.Join(dirInApex, cc.RelativeInstallPath())
|
2018-10-10 07:01:00 +02:00
|
|
|
if !cc.Arch().Native {
|
|
|
|
dirInApex = filepath.Join(dirInApex, cc.Arch().ArchType.String())
|
|
|
|
}
|
2019-01-30 03:31:59 +01:00
|
|
|
if handleSpecialLibs {
|
|
|
|
switch cc.Name() {
|
|
|
|
case "libc", "libm", "libdl":
|
|
|
|
// Special case for bionic libs. This is to prevent the bionic libs
|
|
|
|
// from being included in the search path /apex/com.android.apex/lib.
|
|
|
|
// This exclusion is required because bionic libs in the runtime APEX
|
|
|
|
// are available via the legacy paths /system/lib/libc.so, etc. By the
|
|
|
|
// init process, the bionic libs in the APEX are bind-mounted to the
|
|
|
|
// legacy paths and thus will be loaded into the default linker namespace.
|
|
|
|
// If the bionic libs are directly in /apex/com.android.apex/lib then
|
|
|
|
// the same libs will be again loaded to the runtime linker namespace,
|
|
|
|
// which will result double loading of bionic libs that isn't supported.
|
|
|
|
dirInApex = filepath.Join(dirInApex, "bionic")
|
|
|
|
}
|
2018-12-20 14:10:17 +01:00
|
|
|
}
|
2018-10-10 07:01:00 +02:00
|
|
|
|
|
|
|
fileToCopy = cc.OutputFile().Path()
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
func getCopyManifestForExecutable(cc *cc.Module) (fileToCopy android.Path, dirInApex string) {
|
2019-02-01 04:03:59 +01:00
|
|
|
// TODO(b/123721777) respect relative_install_path also for binaries
|
|
|
|
// dirInApex = filepath.Join("bin", cc.RelativeInstallPath())
|
2018-10-10 07:01:00 +02:00
|
|
|
dirInApex = "bin"
|
|
|
|
fileToCopy = cc.OutputFile().Path()
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2019-02-05 16:16:29 +01:00
|
|
|
func getCopyManifestForShBinary(sh *android.ShBinary) (fileToCopy android.Path, dirInApex string) {
|
|
|
|
dirInApex = filepath.Join("bin", sh.SubDir())
|
|
|
|
fileToCopy = sh.OutputFile()
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2018-10-10 07:01:00 +02:00
|
|
|
func getCopyManifestForJavaLibrary(java *java.Library) (fileToCopy android.Path, dirInApex string) {
|
|
|
|
dirInApex = "javalib"
|
2018-11-07 18:50:25 +01:00
|
|
|
fileToCopy = java.DexJarFile()
|
2018-10-10 07:01:00 +02:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
func getCopyManifestForPrebuiltEtc(prebuilt *android.PrebuiltEtc) (fileToCopy android.Path, dirInApex string) {
|
|
|
|
dirInApex = filepath.Join("etc", prebuilt.SubDir())
|
|
|
|
fileToCopy = prebuilt.OutputFile()
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
2018-11-07 18:50:25 +01:00
|
|
|
filesInfo := []apexFile{}
|
2018-10-10 07:01:00 +02:00
|
|
|
|
2018-10-12 14:49:38 +02:00
|
|
|
var keyFile android.Path
|
2018-12-27 08:04:18 +01:00
|
|
|
var pubKeyFile android.Path
|
2018-10-30 13:20:05 +01:00
|
|
|
var certificate java.Certificate
|
2018-10-12 14:49:38 +02:00
|
|
|
|
2018-11-30 02:12:15 +01:00
|
|
|
if a.properties.Payload_type == nil || *a.properties.Payload_type == "image" {
|
|
|
|
a.apexTypes = imageApex
|
|
|
|
} else if *a.properties.Payload_type == "zip" {
|
|
|
|
a.apexTypes = zipApex
|
|
|
|
} else if *a.properties.Payload_type == "both" {
|
|
|
|
a.apexTypes = both
|
|
|
|
} else {
|
|
|
|
ctx.PropertyErrorf("type", "%q is not one of \"image\", \"zip\", or \"both\".", *a.properties.Payload_type)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2019-01-30 03:31:59 +01:00
|
|
|
handleSpecialLibs := !android.Bool(a.properties.Ignore_system_library_special_case)
|
|
|
|
|
2018-10-10 07:01:00 +02:00
|
|
|
ctx.WalkDeps(func(child, parent android.Module) bool {
|
|
|
|
if _, ok := parent.(*apexBundle); ok {
|
|
|
|
// direct dependencies
|
|
|
|
depTag := ctx.OtherModuleDependencyTag(child)
|
2018-10-12 14:49:38 +02:00
|
|
|
depName := ctx.OtherModuleName(child)
|
2018-10-10 07:01:00 +02:00
|
|
|
switch depTag {
|
|
|
|
case sharedLibTag:
|
|
|
|
if cc, ok := child.(*cc.Module); ok {
|
2019-01-30 03:31:59 +01:00
|
|
|
fileToCopy, dirInApex := getCopyManifestForNativeLibrary(cc, handleSpecialLibs)
|
2019-01-12 16:39:51 +01:00
|
|
|
filesInfo = append(filesInfo, apexFile{fileToCopy, depName, dirInApex, nativeSharedLib, cc, nil})
|
2018-10-10 07:01:00 +02:00
|
|
|
return true
|
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-01-24 20:37:55 +01:00
|
|
|
if !cc.Arch().Native {
|
|
|
|
// There is only one 'bin' directory so we shouldn't bother copying in
|
|
|
|
// native-bridge'd binaries and only use main ones.
|
|
|
|
return true
|
|
|
|
}
|
2018-10-10 07:01:00 +02:00
|
|
|
fileToCopy, dirInApex := getCopyManifestForExecutable(cc)
|
2019-01-12 16:39:51 +01:00
|
|
|
filesInfo = append(filesInfo, apexFile{fileToCopy, depName, dirInApex, nativeExecutable, cc, cc.Symlinks()})
|
2018-10-10 07:01:00 +02:00
|
|
|
return true
|
2019-02-05 16:16:29 +01:00
|
|
|
} else if sh, ok := child.(*android.ShBinary); ok {
|
|
|
|
fileToCopy, dirInApex := getCopyManifestForShBinary(sh)
|
|
|
|
filesInfo = append(filesInfo, apexFile{fileToCopy, depName, dirInApex, shBinary, sh, nil})
|
2018-10-12 14:49:38 +02:00
|
|
|
} else {
|
2019-02-05 16:16:29 +01:00
|
|
|
ctx.PropertyErrorf("binaries", "%q is neithher cc_binary nor sh_binary", depName)
|
2018-10-10 07:01:00 +02:00
|
|
|
}
|
|
|
|
case javaLibTag:
|
|
|
|
if java, ok := child.(*java.Library); ok {
|
|
|
|
fileToCopy, dirInApex := getCopyManifestForJavaLibrary(java)
|
2018-11-07 18:50:25 +01:00
|
|
|
if fileToCopy == nil {
|
|
|
|
ctx.PropertyErrorf("java_libs", "%q is not configured to be compiled into dex", depName)
|
|
|
|
} else {
|
2019-01-12 16:39:51 +01:00
|
|
|
filesInfo = append(filesInfo, apexFile{fileToCopy, depName, dirInApex, javaSharedLib, java, nil})
|
2018-11-07 18:50:25 +01:00
|
|
|
}
|
2018-10-10 07:01:00 +02:00
|
|
|
return true
|
2018-10-12 14:49:38 +02:00
|
|
|
} else {
|
|
|
|
ctx.PropertyErrorf("java_libs", "%q is not a java_library module", depName)
|
2018-10-10 07:01:00 +02:00
|
|
|
}
|
|
|
|
case prebuiltTag:
|
|
|
|
if prebuilt, ok := child.(*android.PrebuiltEtc); ok {
|
|
|
|
fileToCopy, dirInApex := getCopyManifestForPrebuiltEtc(prebuilt)
|
2019-01-12 16:39:51 +01:00
|
|
|
filesInfo = append(filesInfo, apexFile{fileToCopy, depName, dirInApex, etc, prebuilt, nil})
|
2018-10-10 07:01:00 +02:00
|
|
|
return true
|
2018-10-12 14:49:38 +02:00
|
|
|
} else {
|
|
|
|
ctx.PropertyErrorf("prebuilts", "%q is not a prebuilt_etc module", depName)
|
|
|
|
}
|
|
|
|
case keyTag:
|
|
|
|
if key, ok := child.(*apexKey); ok {
|
|
|
|
keyFile = key.private_key_file
|
2018-12-27 08:04:18 +01:00
|
|
|
if !key.installable() && ctx.Config().Debuggable() {
|
|
|
|
// If the key is not installed, bundled it with the APEX.
|
|
|
|
// Note: this bundled key is valid only for non-production builds
|
|
|
|
// (eng/userdebug).
|
|
|
|
pubKeyFile = key.public_key_file
|
|
|
|
}
|
2018-10-12 14:49:38 +02:00
|
|
|
return false
|
|
|
|
} else {
|
|
|
|
ctx.PropertyErrorf("key", "%q is not an apex_key module", depName)
|
2018-10-10 07:01:00 +02:00
|
|
|
}
|
2018-10-30 13:20:05 +01:00
|
|
|
case certificateTag:
|
|
|
|
if dep, ok := child.(*java.AndroidAppCertificate); ok {
|
|
|
|
certificate = dep.Certificate
|
|
|
|
return false
|
|
|
|
} else {
|
|
|
|
ctx.ModuleErrorf("certificate dependency %q must be an android_app_certificate module", depName)
|
|
|
|
}
|
2018-10-10 07:01:00 +02:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// indirect dependencies
|
|
|
|
if am, ok := child.(android.ApexModule); ok && am.CanHaveApexVariants() && am.IsInstallableToApex() {
|
|
|
|
if cc, ok := child.(*cc.Module); ok {
|
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
|
|
|
if cc.IsStubs() || cc.HasStubsVariants() {
|
|
|
|
return false
|
|
|
|
}
|
2018-11-07 18:50:25 +01:00
|
|
|
depName := ctx.OtherModuleName(child)
|
2019-01-30 03:31:59 +01:00
|
|
|
fileToCopy, dirInApex := getCopyManifestForNativeLibrary(cc, handleSpecialLibs)
|
2019-01-12 16:39:51 +01:00
|
|
|
filesInfo = append(filesInfo, apexFile{fileToCopy, depName, dirInApex, nativeSharedLib, cc, nil})
|
2018-10-10 07:01:00 +02:00
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
})
|
|
|
|
|
2018-12-24 03:31:58 +01:00
|
|
|
a.flattened = ctx.Config().FlattenApex() && !ctx.Config().UnbundledBuild()
|
2019-02-02 05:13:47 +01:00
|
|
|
if keyFile == 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 {
|
|
|
|
encountered := make(map[android.Path]bool)
|
|
|
|
result := []apexFile{}
|
|
|
|
for _, f := range filesInfo {
|
|
|
|
if !encountered[f.builtFile] {
|
|
|
|
encountered[f.builtFile] = true
|
|
|
|
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()
|
|
|
|
})
|
|
|
|
|
|
|
|
// 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 {
|
|
|
|
filesInfo[i].moduleName = ctx.ModuleName() + "." + filesInfo[i].moduleName
|
|
|
|
}
|
|
|
|
|
|
|
|
a.installDir = android.PathForModuleInstall(ctx, "apex")
|
|
|
|
a.filesInfo = filesInfo
|
2018-11-30 02:12:15 +01:00
|
|
|
|
|
|
|
if a.apexTypes.zip() {
|
2018-12-27 08:04:18 +01:00
|
|
|
a.buildUnflattenedApex(ctx, keyFile, pubKeyFile, certificate, zipApex)
|
2018-11-30 02:12:15 +01:00
|
|
|
}
|
|
|
|
if a.apexTypes.image() {
|
2019-02-02 05:13:47 +01:00
|
|
|
// Build rule for unflattened APEX is created even when ctx.Config().FlattenApex()
|
|
|
|
// is true. This is to support referencing APEX via ":<module_name" syntax
|
|
|
|
// in other modules. It is in AndroidMk where the selection of flattened
|
|
|
|
// or unflattened APEX is made.
|
|
|
|
a.buildUnflattenedApex(ctx, keyFile, pubKeyFile, certificate, imageApex)
|
|
|
|
a.buildFlattenedApex(ctx)
|
2018-11-07 18:50:25 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-12-27 08:04:18 +01:00
|
|
|
func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext, keyFile android.Path,
|
|
|
|
pubKeyFile android.Path, certificate java.Certificate, apexType apexPackaging) {
|
2018-10-30 13:20:05 +01:00
|
|
|
cert := String(a.properties.Certificate)
|
|
|
|
if cert != "" && android.SrcIsModule(cert) == "" {
|
|
|
|
defaultDir := ctx.Config().DefaultAppCertificateDir(ctx)
|
|
|
|
certificate = java.Certificate{
|
|
|
|
defaultDir.Join(ctx, cert+".x509.pem"),
|
|
|
|
defaultDir.Join(ctx, cert+".pk8"),
|
|
|
|
}
|
|
|
|
} else if cert == "" {
|
|
|
|
pem, key := ctx.Config().DefaultAppCertificate(ctx)
|
|
|
|
certificate = java.Certificate{pem, key}
|
|
|
|
}
|
|
|
|
|
2018-11-20 19:04:58 +01:00
|
|
|
manifest := android.PathForModuleSrc(ctx, proptools.StringDefault(a.properties.Manifest, "apex_manifest.json"))
|
2018-11-09 22:37:15 +01:00
|
|
|
|
2018-11-30 02:12:15 +01:00
|
|
|
var abis []string
|
|
|
|
for _, target := range ctx.MultiTargets() {
|
|
|
|
if len(target.Arch.Abi) > 0 {
|
|
|
|
abis = append(abis, target.Arch.Abi[0])
|
|
|
|
}
|
2018-11-09 22:37:15 +01:00
|
|
|
}
|
2018-10-10 07:01:00 +02:00
|
|
|
|
2018-11-30 02:12:15 +01:00
|
|
|
abis = android.FirstUniqueStrings(abis)
|
|
|
|
|
|
|
|
suffix := apexType.suffix()
|
|
|
|
unsignedOutputFile := android.PathForModuleOut(ctx, ctx.ModuleName()+suffix+".unsigned")
|
2018-10-10 07:01:00 +02:00
|
|
|
|
2018-10-10 07:05:29 +02:00
|
|
|
filesToCopy := []android.Path{}
|
2018-11-07 18:50:25 +01:00
|
|
|
for _, f := range a.filesInfo {
|
|
|
|
filesToCopy = append(filesToCopy, f.builtFile)
|
2018-10-10 07:01:00 +02:00
|
|
|
}
|
2018-10-10 07:05:29 +02:00
|
|
|
|
2018-10-10 07:01:00 +02:00
|
|
|
copyCommands := []string{}
|
2018-11-07 18:50:25 +01:00
|
|
|
for i, src := range filesToCopy {
|
|
|
|
dest := filepath.Join(a.filesInfo[i].installDir, src.Base())
|
2018-11-30 02:12:15 +01:00
|
|
|
dest_path := filepath.Join(android.PathForModuleOut(ctx, "image"+suffix).String(), dest)
|
2018-10-10 07:01:00 +02:00
|
|
|
copyCommands = append(copyCommands, "mkdir -p "+filepath.Dir(dest_path))
|
|
|
|
copyCommands = append(copyCommands, "cp "+src.String()+" "+dest_path)
|
2019-01-18 23:37:31 +01:00
|
|
|
for _, sym := range a.filesInfo[i].symlinks {
|
|
|
|
symlinkDest := filepath.Join(filepath.Dir(dest_path), sym)
|
|
|
|
copyCommands = append(copyCommands, "ln -s "+filepath.Base(dest)+" "+symlinkDest)
|
|
|
|
}
|
2018-10-10 07:01:00 +02:00
|
|
|
}
|
2018-10-10 07:05:29 +02:00
|
|
|
implicitInputs := append(android.Paths(nil), filesToCopy...)
|
2018-11-30 02:12:15 +01:00
|
|
|
implicitInputs = append(implicitInputs, manifest)
|
|
|
|
|
2018-10-10 07:01:00 +02:00
|
|
|
outHostBinDir := android.PathForOutput(ctx, "host", ctx.Config().PrebuiltOS(), "bin").String()
|
|
|
|
prebuiltSdkToolsBinDir := filepath.Join("prebuilts", "sdk", "tools", runtime.GOOS, "bin")
|
|
|
|
|
2018-11-30 02:12:15 +01:00
|
|
|
if apexType.image() {
|
|
|
|
// files and dirs that will be created in APEX
|
|
|
|
var readOnlyPaths []string
|
|
|
|
var executablePaths []string // this also includes dirs
|
|
|
|
for _, f := range a.filesInfo {
|
|
|
|
pathInApex := filepath.Join(f.installDir, f.builtFile.Base())
|
|
|
|
if f.installDir == "bin" {
|
|
|
|
executablePaths = append(executablePaths, pathInApex)
|
2019-01-18 23:37:31 +01:00
|
|
|
for _, s := range f.symlinks {
|
|
|
|
executablePaths = append(executablePaths, filepath.Join("bin", s))
|
|
|
|
}
|
2018-11-30 02:12:15 +01:00
|
|
|
} else {
|
|
|
|
readOnlyPaths = append(readOnlyPaths, pathInApex)
|
|
|
|
}
|
2018-12-06 16:42:25 +01:00
|
|
|
dir := f.installDir
|
|
|
|
for !android.InList(dir, executablePaths) && dir != "" {
|
|
|
|
executablePaths = append(executablePaths, dir)
|
|
|
|
dir, _ = filepath.Split(dir) // move up to the parent
|
|
|
|
if len(dir) > 0 {
|
|
|
|
// remove trailing slash
|
|
|
|
dir = dir[:len(dir)-1]
|
|
|
|
}
|
2018-11-30 02:12:15 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
sort.Strings(readOnlyPaths)
|
|
|
|
sort.Strings(executablePaths)
|
|
|
|
cannedFsConfig := android.PathForModuleOut(ctx, "canned_fs_config")
|
|
|
|
ctx.Build(pctx, android.BuildParams{
|
|
|
|
Rule: generateFsConfig,
|
|
|
|
Output: cannedFsConfig,
|
|
|
|
Description: "generate fs config",
|
|
|
|
Args: map[string]string{
|
|
|
|
"ro_paths": strings.Join(readOnlyPaths, " "),
|
|
|
|
"exec_paths": strings.Join(executablePaths, " "),
|
|
|
|
},
|
|
|
|
})
|
|
|
|
|
|
|
|
fcName := proptools.StringDefault(a.properties.File_contexts, ctx.ModuleName())
|
|
|
|
fileContextsPath := "system/sepolicy/apex/" + fcName + "-file_contexts"
|
|
|
|
fileContextsOptionalPath := android.ExistentPathForSource(ctx, fileContextsPath)
|
|
|
|
if !fileContextsOptionalPath.Valid() {
|
|
|
|
ctx.ModuleErrorf("Cannot find file_contexts file: %q", fileContextsPath)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
fileContexts := fileContextsOptionalPath.Path()
|
|
|
|
|
2018-12-27 08:04:18 +01:00
|
|
|
optFlags := []string{}
|
|
|
|
|
2018-11-30 02:12:15 +01:00
|
|
|
// Additional implicit inputs.
|
|
|
|
implicitInputs = append(implicitInputs, cannedFsConfig, fileContexts, keyFile)
|
2018-12-27 08:04:18 +01:00
|
|
|
if pubKeyFile != nil {
|
|
|
|
implicitInputs = append(implicitInputs, pubKeyFile)
|
|
|
|
optFlags = append(optFlags, "--pubkey "+pubKeyFile.String())
|
|
|
|
}
|
2018-11-30 02:12:15 +01:00
|
|
|
|
2019-01-05 04:57:48 +01:00
|
|
|
manifestPackageName, overridden := ctx.DeviceConfig().OverrideManifestPackageNameFor(ctx.ModuleName())
|
|
|
|
if overridden {
|
|
|
|
optFlags = append(optFlags, "--override_apk_package_name "+manifestPackageName)
|
|
|
|
}
|
|
|
|
|
2018-11-30 02:12:15 +01:00
|
|
|
ctx.Build(pctx, android.BuildParams{
|
|
|
|
Rule: apexRule,
|
|
|
|
Implicits: implicitInputs,
|
|
|
|
Output: unsignedOutputFile,
|
|
|
|
Description: "apex (" + apexType.name() + ")",
|
|
|
|
Args: map[string]string{
|
|
|
|
"tool_path": outHostBinDir + ":" + prebuiltSdkToolsBinDir,
|
|
|
|
"image_dir": android.PathForModuleOut(ctx, "image"+suffix).String(),
|
|
|
|
"copy_commands": strings.Join(copyCommands, " && "),
|
|
|
|
"manifest": manifest.String(),
|
|
|
|
"file_contexts": fileContexts.String(),
|
|
|
|
"canned_fs_config": cannedFsConfig.String(),
|
|
|
|
"key": keyFile.String(),
|
2018-12-27 08:04:18 +01:00
|
|
|
"opt_flags": strings.Join(optFlags, " "),
|
2018-11-30 02:12:15 +01:00
|
|
|
},
|
|
|
|
})
|
2018-11-16 20:36:28 +01:00
|
|
|
|
2018-11-30 02:12:15 +01:00
|
|
|
apexProtoFile := android.PathForModuleOut(ctx, ctx.ModuleName()+".pb"+suffix)
|
|
|
|
bundleModuleFile := android.PathForModuleOut(ctx, ctx.ModuleName()+suffix+"-base.zip")
|
|
|
|
a.bundleModuleFile = bundleModuleFile
|
2018-11-16 20:36:28 +01:00
|
|
|
|
2018-11-30 02:12:15 +01:00
|
|
|
ctx.Build(pctx, android.BuildParams{
|
|
|
|
Rule: apexProtoConvertRule,
|
|
|
|
Input: unsignedOutputFile,
|
|
|
|
Output: apexProtoFile,
|
|
|
|
Description: "apex proto convert",
|
|
|
|
})
|
2018-11-16 20:36:28 +01:00
|
|
|
|
2018-11-30 02:12:15 +01:00
|
|
|
ctx.Build(pctx, android.BuildParams{
|
|
|
|
Rule: apexBundleRule,
|
|
|
|
Input: apexProtoFile,
|
|
|
|
Output: a.bundleModuleFile,
|
|
|
|
Description: "apex bundle module",
|
|
|
|
Args: map[string]string{
|
|
|
|
"abi": strings.Join(abis, "."),
|
|
|
|
},
|
|
|
|
})
|
|
|
|
} else {
|
|
|
|
ctx.Build(pctx, android.BuildParams{
|
|
|
|
Rule: zipApexRule,
|
|
|
|
Implicits: implicitInputs,
|
|
|
|
Output: unsignedOutputFile,
|
|
|
|
Description: "apex (" + apexType.name() + ")",
|
|
|
|
Args: map[string]string{
|
|
|
|
"tool_path": outHostBinDir + ":" + prebuiltSdkToolsBinDir,
|
|
|
|
"image_dir": android.PathForModuleOut(ctx, "image"+suffix).String(),
|
|
|
|
"copy_commands": strings.Join(copyCommands, " && "),
|
|
|
|
"manifest": manifest.String(),
|
|
|
|
},
|
|
|
|
})
|
|
|
|
}
|
2018-11-16 20:36:28 +01:00
|
|
|
|
2018-11-30 02:12:15 +01:00
|
|
|
a.outputFiles[apexType] = android.PathForModuleOut(ctx, ctx.ModuleName()+suffix)
|
2018-10-30 13:20:05 +01:00
|
|
|
ctx.Build(pctx, android.BuildParams{
|
|
|
|
Rule: java.Signapk,
|
|
|
|
Description: "signapk",
|
2018-11-30 02:12:15 +01:00
|
|
|
Output: a.outputFiles[apexType],
|
2018-10-30 13:20:05 +01:00
|
|
|
Input: unsignedOutputFile,
|
|
|
|
Args: map[string]string{
|
|
|
|
"certificates": strings.Join([]string{certificate.Pem.String(), certificate.Key.String()}, " "),
|
2018-11-21 18:51:54 +01:00
|
|
|
"flags": "-a 4096", //alignment
|
2018-10-30 13:20:05 +01:00
|
|
|
},
|
|
|
|
})
|
2018-11-30 02:12:15 +01:00
|
|
|
|
|
|
|
// Install to $OUT/soong/{target,host}/.../apex
|
2019-02-02 05:13:47 +01:00
|
|
|
if a.installable() && !ctx.Config().FlattenApex() {
|
2018-12-13 15:14:57 +01:00
|
|
|
ctx.InstallFile(android.PathForModuleInstall(ctx, "apex"), ctx.ModuleName()+suffix, a.outputFiles[apexType])
|
|
|
|
}
|
2018-11-07 18:50:25 +01:00
|
|
|
}
|
2018-10-30 13:20:05 +01:00
|
|
|
|
2018-11-07 18:50:25 +01:00
|
|
|
func (a *apexBundle) buildFlattenedApex(ctx android.ModuleContext) {
|
2018-12-13 15:14:57 +01:00
|
|
|
if a.installable() {
|
|
|
|
// For flattened APEX, do nothing but make sure that apex_manifest.json file is also copied along
|
|
|
|
// with other ordinary files.
|
|
|
|
manifest := android.PathForModuleSrc(ctx, proptools.StringDefault(a.properties.Manifest, "apex_manifest.json"))
|
2019-01-09 16:23:16 +01:00
|
|
|
|
|
|
|
// rename to apex_manifest.json
|
|
|
|
copiedManifest := android.PathForModuleOut(ctx, "apex_manifest.json")
|
|
|
|
ctx.Build(pctx, android.BuildParams{
|
|
|
|
Rule: android.Cp,
|
|
|
|
Input: manifest,
|
|
|
|
Output: copiedManifest,
|
|
|
|
})
|
2019-01-12 16:39:51 +01:00
|
|
|
a.filesInfo = append(a.filesInfo, apexFile{copiedManifest, ctx.ModuleName() + ".apex_manifest.json", ".", etc, nil, nil})
|
2018-12-13 15:14:57 +01:00
|
|
|
|
2019-02-02 05:13:47 +01:00
|
|
|
if ctx.Config().FlattenApex() {
|
|
|
|
for _, fi := range a.filesInfo {
|
|
|
|
dir := filepath.Join("apex", ctx.ModuleName(), fi.installDir)
|
|
|
|
ctx.InstallFile(android.PathForModuleInstall(ctx, dir), fi.builtFile.Base(), fi.builtFile)
|
|
|
|
}
|
2018-12-13 15:14:57 +01:00
|
|
|
}
|
2018-11-07 18:50:25 +01:00
|
|
|
}
|
2018-10-10 07:01:00 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func (a *apexBundle) AndroidMk() android.AndroidMkData {
|
2018-11-30 02:12:15 +01:00
|
|
|
writers := []android.AndroidMkData{}
|
|
|
|
if a.apexTypes.image() {
|
|
|
|
writers = append(writers, a.androidMkForType(imageApex))
|
|
|
|
}
|
|
|
|
if a.apexTypes.zip() {
|
|
|
|
writers = append(writers, a.androidMkForType(zipApex))
|
|
|
|
}
|
|
|
|
return android.AndroidMkData{
|
|
|
|
Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {
|
|
|
|
for _, data := range writers {
|
|
|
|
data.Custom(w, name, prefix, moduleDir, data)
|
|
|
|
}
|
|
|
|
}}
|
|
|
|
}
|
|
|
|
|
2019-02-05 15:18:47 +01:00
|
|
|
func (a *apexBundle) androidMkForFiles(w io.Writer, name, moduleDir string) []string {
|
|
|
|
moduleNames := []string{}
|
2019-01-12 16:39:51 +01:00
|
|
|
|
2019-02-05 15:18:47 +01:00
|
|
|
for _, fi := range a.filesInfo {
|
|
|
|
if cc, ok := fi.module.(*cc.Module); ok && cc.Properties.HideFromMake {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
if !android.InList(fi.moduleName, moduleNames) {
|
|
|
|
moduleNames = append(moduleNames, fi.moduleName)
|
|
|
|
}
|
|
|
|
fmt.Fprintln(w, "\ninclude $(CLEAR_VARS)")
|
|
|
|
fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir)
|
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE :=", fi.moduleName)
|
|
|
|
if a.flattened {
|
|
|
|
// /system/apex/<name>/{lib|framework|...}
|
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_PATH :=", filepath.Join("$(OUT_DIR)",
|
|
|
|
a.installDir.RelPathString(), name, fi.installDir))
|
|
|
|
} else {
|
|
|
|
// /apex/<name>/{lib|framework|...}
|
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_PATH :=", filepath.Join("$(PRODUCT_OUT)",
|
|
|
|
"apex", name, fi.installDir))
|
|
|
|
}
|
|
|
|
fmt.Fprintln(w, "LOCAL_PREBUILT_MODULE_FILE :=", fi.builtFile.String())
|
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_CLASS :=", fi.class.NameInMake())
|
|
|
|
if fi.module != nil {
|
|
|
|
archStr := fi.module.Target().Arch.ArchType.String()
|
|
|
|
host := false
|
|
|
|
switch fi.module.Target().Os.Class {
|
|
|
|
case android.Host:
|
|
|
|
if archStr != "common" {
|
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_HOST_ARCH :=", archStr)
|
2018-11-07 18:50:25 +01:00
|
|
|
}
|
2019-02-05 15:18:47 +01:00
|
|
|
host = true
|
|
|
|
case android.HostCross:
|
|
|
|
if archStr != "common" {
|
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_HOST_CROSS_ARCH :=", archStr)
|
2019-01-12 16:39:51 +01:00
|
|
|
}
|
2019-02-05 15:18:47 +01:00
|
|
|
host = true
|
|
|
|
case android.Device:
|
|
|
|
if archStr != "common" {
|
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_TARGET_ARCH :=", archStr)
|
2019-01-12 16:39:51 +01:00
|
|
|
}
|
2019-02-05 15:18:47 +01:00
|
|
|
}
|
|
|
|
if host {
|
|
|
|
makeOs := fi.module.Target().Os.String()
|
|
|
|
if fi.module.Target().Os == android.Linux || fi.module.Target().Os == android.LinuxBionic {
|
|
|
|
makeOs = "linux"
|
2019-01-11 21:23:36 +01:00
|
|
|
}
|
2019-02-05 15:18:47 +01:00
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_HOST_OS :=", makeOs)
|
|
|
|
fmt.Fprintln(w, "LOCAL_IS_HOST_MODULE := true")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if fi.class == javaSharedLib {
|
|
|
|
javaModule := fi.module.(*java.Library)
|
|
|
|
// soong_java_prebuilt.mk sets LOCAL_MODULE_SUFFIX := .jar Therefore
|
|
|
|
// we need to remove the suffix from LOCAL_MODULE_STEM, otherwise
|
|
|
|
// we will have foo.jar.jar
|
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", strings.TrimSuffix(fi.builtFile.Base(), ".jar"))
|
|
|
|
fmt.Fprintln(w, "LOCAL_SOONG_CLASSES_JAR :=", javaModule.ImplementationAndResourcesJars()[0].String())
|
|
|
|
fmt.Fprintln(w, "LOCAL_SOONG_HEADER_JAR :=", javaModule.HeaderJars()[0].String())
|
|
|
|
fmt.Fprintln(w, "LOCAL_SOONG_DEX_JAR :=", fi.builtFile.String())
|
|
|
|
fmt.Fprintln(w, "LOCAL_DEX_PREOPT := false")
|
|
|
|
fmt.Fprintln(w, "include $(BUILD_SYSTEM)/soong_java_prebuilt.mk")
|
|
|
|
} else if fi.class == nativeSharedLib || fi.class == nativeExecutable {
|
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", fi.builtFile.Base())
|
|
|
|
if cc, ok := fi.module.(*cc.Module); ok && cc.UnstrippedOutputFile() != nil {
|
|
|
|
fmt.Fprintln(w, "LOCAL_SOONG_UNSTRIPPED_BINARY :=", cc.UnstrippedOutputFile().String())
|
|
|
|
}
|
|
|
|
fmt.Fprintln(w, "include $(BUILD_SYSTEM)/soong_cc_prebuilt.mk")
|
|
|
|
} else {
|
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", fi.builtFile.Base())
|
|
|
|
fmt.Fprintln(w, "include $(BUILD_PREBUILT)")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return moduleNames
|
|
|
|
}
|
|
|
|
|
|
|
|
func (a *apexBundle) androidMkForType(apexType apexPackaging) android.AndroidMkData {
|
|
|
|
return android.AndroidMkData{
|
|
|
|
Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {
|
|
|
|
moduleNames := []string{}
|
|
|
|
if a.installable() {
|
2019-02-07 08:46:59 +01:00
|
|
|
moduleNames = a.androidMkForFiles(w, name, moduleDir)
|
2019-01-12 16:39:51 +01:00
|
|
|
}
|
2019-02-05 15:18:47 +01:00
|
|
|
|
2019-01-12 16:39:51 +01:00
|
|
|
if a.flattened && apexType.image() {
|
|
|
|
// Only image APEXes can be flattened.
|
|
|
|
fmt.Fprintln(w, "\ninclude $(CLEAR_VARS)")
|
|
|
|
fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir)
|
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE :=", name)
|
2019-02-05 15:18:47 +01:00
|
|
|
if len(moduleNames) > 0 {
|
|
|
|
fmt.Fprintln(w, "LOCAL_REQUIRED_MODULES :=", strings.Join(moduleNames, " "))
|
|
|
|
}
|
2019-01-12 16:39:51 +01:00
|
|
|
fmt.Fprintln(w, "include $(BUILD_PHONY_PACKAGE)")
|
|
|
|
} else {
|
2018-11-30 02:12:15 +01:00
|
|
|
// zip-apex is the less common type so have the name refer to the image-apex
|
|
|
|
// only and use {name}.zip if you want the zip-apex
|
|
|
|
if apexType == zipApex && a.apexTypes == both {
|
|
|
|
name = name + ".zip"
|
|
|
|
}
|
2018-11-07 18:50:25 +01:00
|
|
|
fmt.Fprintln(w, "\ninclude $(CLEAR_VARS)")
|
|
|
|
fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir)
|
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE :=", name)
|
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_CLASS := ETC") // do we need a new class?
|
2018-11-30 02:12:15 +01:00
|
|
|
fmt.Fprintln(w, "LOCAL_PREBUILT_MODULE_FILE :=", a.outputFiles[apexType].String())
|
2018-11-07 18:50:25 +01:00
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_PATH :=", filepath.Join("$(OUT_DIR)", a.installDir.RelPathString()))
|
2019-01-03 07:32:27 +01:00
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", name+apexType.suffix())
|
2018-12-13 15:14:57 +01:00
|
|
|
fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE :=", !a.installable())
|
2018-11-07 18:50:25 +01:00
|
|
|
fmt.Fprintln(w, "LOCAL_REQUIRED_MODULES :=", String(a.properties.Key))
|
2019-02-05 15:18:47 +01:00
|
|
|
if len(moduleNames) > 0 {
|
|
|
|
fmt.Fprintln(w, "LOCAL_REQUIRED_MODULES +=", strings.Join(moduleNames, " "))
|
|
|
|
}
|
2018-11-07 18:50:25 +01:00
|
|
|
fmt.Fprintln(w, "include $(BUILD_PREBUILT)")
|
2018-11-16 20:36:28 +01:00
|
|
|
|
2018-11-30 02:12:15 +01:00
|
|
|
if apexType == imageApex {
|
|
|
|
fmt.Fprintln(w, "ALL_MODULES.$(LOCAL_MODULE).BUNDLE :=", a.bundleModuleFile.String())
|
|
|
|
}
|
2019-01-12 16:39:51 +01:00
|
|
|
}
|
|
|
|
}}
|
2018-10-10 07:01:00 +02:00
|
|
|
}
|
|
|
|
|
2019-02-07 22:20:53 +01:00
|
|
|
func testApexBundleFactory() android.Module {
|
|
|
|
return ApexBundleFactory( /*testApex*/ true)
|
|
|
|
}
|
|
|
|
|
|
|
|
func apexBundleFactory() android.Module {
|
|
|
|
return ApexBundleFactory( /*testApex*/ false)
|
|
|
|
}
|
|
|
|
|
|
|
|
func ApexBundleFactory(testApex bool) android.Module {
|
2018-11-30 02:12:15 +01:00
|
|
|
module := &apexBundle{
|
|
|
|
outputFiles: map[apexPackaging]android.WritablePath{},
|
2019-02-07 22:20:53 +01:00
|
|
|
testApex: testApex,
|
2018-11-30 02:12:15 +01:00
|
|
|
}
|
2018-10-10 07:01:00 +02:00
|
|
|
module.AddProperties(&module.properties)
|
2019-01-30 03:07:33 +01:00
|
|
|
module.AddProperties(&module.targetProperties)
|
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)
|
|
|
|
return module
|
|
|
|
}
|
2019-02-07 08:27:23 +01:00
|
|
|
|
|
|
|
//
|
|
|
|
// Defaults
|
|
|
|
//
|
|
|
|
type Defaults struct {
|
|
|
|
android.ModuleBase
|
|
|
|
android.DefaultsModuleBase
|
|
|
|
}
|
|
|
|
|
|
|
|
func (*Defaults) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
|
|
|
}
|
|
|
|
|
|
|
|
func defaultsFactory() android.Module {
|
|
|
|
return DefaultsFactory()
|
|
|
|
}
|
|
|
|
|
|
|
|
func DefaultsFactory(props ...interface{}) android.Module {
|
|
|
|
module := &Defaults{}
|
|
|
|
|
|
|
|
module.AddProperties(props...)
|
|
|
|
module.AddProperties(
|
|
|
|
&apexBundleProperties{},
|
|
|
|
&apexTargetBundleProperties{},
|
|
|
|
)
|
|
|
|
|
|
|
|
android.InitDefaultsModule(module)
|
|
|
|
return module
|
|
|
|
}
|