2016-08-16 00:02:23 +02:00
|
|
|
subdirs = [
|
|
|
|
|
"androidmk",
|
2017-06-20 00:39:54 +02:00
|
|
|
"bpfix",
|
2016-08-16 00:02:23 +02:00
|
|
|
"cmd/*",
|
2017-08-10 03:25:28 +02:00
|
|
|
"fs",
|
|
|
|
|
"finder",
|
2017-08-22 05:13:28 +02:00
|
|
|
"jar",
|
2017-10-12 21:19:14 +02:00
|
|
|
"zip",
|
2016-08-16 00:02:23 +02:00
|
|
|
"third_party/zip",
|
Add a Go replacement for our top-level Make wrapper
Right now this mostly just copies what Make is doing in
build/core/ninja.mk and build/core/soong.mk. The only major feature it
adds is a rotating log file with some verbose logging.
There is one major functional difference -- you cannot override random
Make variables during the Make phase anymore. The environment variable
is set, and if Make uses ?= or the equivalent, it can still use those
variables. We already made this change for Kati, which also loads all of
the same code and actually does the build, so it has been half-removed
for a while.
The only "UI" this implements is what I'll call "Make Emulation" mode --
it's expected that current command lines will continue working, and
we'll explore alternate user interfaces later.
We're still using Make as a wrapper, but all it does is call into this
single Go program, it won't even load the product configuration. Once
this is default, we can start moving individual users over to using this
directly (still in Make emulation mode), skipping the Make wrapper.
Ideas for the future:
* Generating trace files showing time spent in Make/Kati/Soong/Ninja
(also importing ninja traces into the same stream). I had this working
in a previous version of this patch, but removed it to keep the size
down and focus on the current features.
* More intelligent SIGALRM handling, once we fully remove the Make
wrapper (which hides the SIGALRM)
* Reading the experimental binary output stream from Ninja, so that we
can always save the verbose log even if we're not printing it out to
the console
Test: USE_SOONG_UI=true m -j blueprint_tools
Change-Id: I884327b9a8ae24499eb6c56f6e1ad26df1cfa4e4
2016-08-22 00:17:17 +02:00
|
|
|
"ui/*",
|
2016-08-16 00:02:23 +02:00
|
|
|
]
|
2015-03-25 22:43:57 +01:00
|
|
|
|
|
|
|
|
bootstrap_go_package {
|
|
|
|
|
name: "soong-env",
|
|
|
|
|
pkgPath: "android/soong/env",
|
|
|
|
|
srcs: [
|
|
|
|
|
"env/env.go",
|
|
|
|
|
],
|
|
|
|
|
}
|
|
|
|
|
|
2015-06-17 23:20:06 +02:00
|
|
|
bootstrap_go_package {
|
|
|
|
|
name: "soong",
|
|
|
|
|
pkgPath: "android/soong",
|
|
|
|
|
deps: [
|
|
|
|
|
"blueprint",
|
|
|
|
|
],
|
|
|
|
|
srcs: [
|
|
|
|
|
"doc.go",
|
|
|
|
|
],
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-14 22:26:32 +01:00
|
|
|
bootstrap_go_package {
|
2016-05-19 00:37:25 +02:00
|
|
|
name: "soong-android",
|
|
|
|
|
pkgPath: "android/soong/android",
|
2015-03-14 22:26:32 +01:00
|
|
|
deps: [
|
2015-01-31 02:27:36 +01:00
|
|
|
"blueprint",
|
|
|
|
|
"blueprint-bootstrap",
|
2015-06-17 23:20:06 +02:00
|
|
|
"soong",
|
2019-11-23 01:03:51 +01:00
|
|
|
"soong-android-soongconfig",
|
2015-03-25 22:43:57 +01:00
|
|
|
"soong-env",
|
2019-04-12 20:11:38 +02:00
|
|
|
"soong-shared",
|
2015-01-31 02:27:36 +01:00
|
|
|
],
|
2015-03-14 22:26:32 +01:00
|
|
|
srcs: [
|
2016-05-19 00:37:25 +02:00
|
|
|
"android/androidmk.go",
|
2018-10-02 17:38:19 +02:00
|
|
|
"android/apex.go",
|
2017-03-28 23:54:55 +02:00
|
|
|
"android/api_levels.go",
|
2016-05-19 00:37:25 +02:00
|
|
|
"android/arch.go",
|
|
|
|
|
"android/config.go",
|
2019-10-11 03:26:26 +02:00
|
|
|
"android/csuite_config.go",
|
2016-05-19 00:37:25 +02:00
|
|
|
"android/defaults.go",
|
|
|
|
|
"android/defs.go",
|
2016-11-04 22:36:38 +01:00
|
|
|
"android/expand.go",
|
2018-04-17 23:58:42 +02:00
|
|
|
"android/filegroup.go",
|
2016-09-13 22:42:32 +02:00
|
|
|
"android/hooks.go",
|
2019-11-19 01:00:16 +01:00
|
|
|
"android/image.go",
|
2016-05-19 00:37:25 +02:00
|
|
|
"android/makevars.go",
|
|
|
|
|
"android/module.go",
|
|
|
|
|
"android/mutator.go",
|
2017-11-30 01:47:17 +01:00
|
|
|
"android/namespace.go",
|
2017-12-06 23:18:35 +01:00
|
|
|
"android/neverallow.go",
|
2019-06-18 02:40:56 +02:00
|
|
|
"android/notices.go",
|
2016-08-18 00:24:12 +02:00
|
|
|
"android/onceper.go",
|
2019-03-01 00:35:54 +01:00
|
|
|
"android/override_module.go",
|
2019-05-31 15:00:04 +02:00
|
|
|
"android/package.go",
|
2016-05-19 00:37:25 +02:00
|
|
|
"android/package_ctx.go",
|
2019-03-05 07:33:56 +01:00
|
|
|
"android/path_properties.go",
|
2016-05-19 00:37:25 +02:00
|
|
|
"android/paths.go",
|
2016-10-07 01:12:58 +02:00
|
|
|
"android/prebuilt.go",
|
2018-04-10 06:07:10 +02:00
|
|
|
"android/prebuilt_etc.go",
|
2017-09-07 19:53:07 +02:00
|
|
|
"android/proto.go",
|
2016-10-12 23:28:16 +02:00
|
|
|
"android/register.go",
|
2019-01-31 02:32:39 +01:00
|
|
|
"android/rule_builder.go",
|
2020-01-11 02:11:46 +01:00
|
|
|
"android/sandbox.go",
|
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/sdk.go",
|
2019-01-26 01:04:11 +01:00
|
|
|
"android/sh_binary.go",
|
2017-11-29 02:34:01 +01:00
|
|
|
"android/singleton.go",
|
2019-11-23 01:03:51 +01:00
|
|
|
"android/soong_config_modules.go",
|
2017-07-13 23:43:27 +02:00
|
|
|
"android/testing.go",
|
2016-05-19 00:37:25 +02:00
|
|
|
"android/util.go",
|
|
|
|
|
"android/variable.go",
|
2019-03-28 15:10:57 +01:00
|
|
|
"android/visibility.go",
|
2019-02-13 02:12:08 +01:00
|
|
|
"android/vts_config.go",
|
2017-12-12 00:52:26 +01:00
|
|
|
"android/writedocs.go",
|
2016-05-13 04:03:10 +02:00
|
|
|
|
|
|
|
|
// Lock down environment access last
|
2016-05-19 00:37:25 +02:00
|
|
|
"android/env.go",
|
2015-01-31 02:27:36 +01:00
|
|
|
],
|
2015-09-24 00:26:20 +02:00
|
|
|
testSrcs: [
|
2019-06-10 23:32:38 +02:00
|
|
|
"android/android_test.go",
|
2019-07-11 09:18:47 +02:00
|
|
|
"android/androidmk_test.go",
|
2019-01-24 23:58:11 +01:00
|
|
|
"android/arch_test.go",
|
2017-11-20 23:31:11 +01:00
|
|
|
"android/config_test.go",
|
2019-10-11 03:26:26 +02:00
|
|
|
"android/csuite_config_test.go",
|
2016-11-04 22:36:38 +01:00
|
|
|
"android/expand_test.go",
|
2019-05-29 23:40:35 +02:00
|
|
|
"android/module_test.go",
|
2019-06-07 01:13:11 +02:00
|
|
|
"android/mutator_test.go",
|
2017-11-30 01:47:17 +01:00
|
|
|
"android/namespace_test.go",
|
2018-03-12 09:34:26 +01:00
|
|
|
"android/neverallow_test.go",
|
2019-02-04 20:22:08 +01:00
|
|
|
"android/onceper_test.go",
|
2019-05-31 15:00:04 +02:00
|
|
|
"android/package_test.go",
|
2019-03-05 07:33:56 +01:00
|
|
|
"android/path_properties_test.go",
|
2016-05-19 00:37:25 +02:00
|
|
|
"android/paths_test.go",
|
2016-10-15 00:38:43 +02:00
|
|
|
"android/prebuilt_test.go",
|
2018-10-26 14:49:39 +02:00
|
|
|
"android/prebuilt_etc_test.go",
|
2019-01-31 02:32:39 +01:00
|
|
|
"android/rule_builder_test.go",
|
2019-11-23 01:03:51 +01:00
|
|
|
"android/soong_config_modules_test.go",
|
2017-10-24 20:13:31 +02:00
|
|
|
"android/util_test.go",
|
2017-05-06 01:16:24 +02:00
|
|
|
"android/variable_test.go",
|
2019-03-28 15:10:57 +01:00
|
|
|
"android/visibility_test.go",
|
2019-02-13 02:12:08 +01:00
|
|
|
"android/vts_config_test.go",
|
2015-09-24 00:26:20 +02:00
|
|
|
],
|
2015-03-14 22:26:32 +01:00
|
|
|
}
|
2015-01-31 02:27:36 +01:00
|
|
|
|
2019-11-23 01:03:51 +01:00
|
|
|
bootstrap_go_package {
|
|
|
|
|
name: "soong-android-soongconfig",
|
|
|
|
|
pkgPath: "android/soong/android/soongconfig",
|
|
|
|
|
deps: [
|
|
|
|
|
"blueprint",
|
|
|
|
|
"blueprint-parser",
|
|
|
|
|
"blueprint-proptools",
|
|
|
|
|
],
|
|
|
|
|
srcs: [
|
|
|
|
|
"android/soongconfig/config.go",
|
|
|
|
|
"android/soongconfig/modules.go",
|
|
|
|
|
],
|
|
|
|
|
}
|
|
|
|
|
|
2016-07-29 22:44:28 +02:00
|
|
|
bootstrap_go_package {
|
|
|
|
|
name: "soong-cc-config",
|
|
|
|
|
pkgPath: "android/soong/cc/config",
|
|
|
|
|
deps: [
|
|
|
|
|
"soong-android",
|
|
|
|
|
],
|
|
|
|
|
srcs: [
|
|
|
|
|
"cc/config/clang.go",
|
|
|
|
|
"cc/config/global.go",
|
2016-09-27 00:45:04 +02:00
|
|
|
"cc/config/tidy.go",
|
2016-07-29 22:44:28 +02:00
|
|
|
"cc/config/toolchain.go",
|
2018-11-13 05:19:56 +01:00
|
|
|
"cc/config/vndk.go",
|
2016-07-29 22:44:28 +02:00
|
|
|
|
|
|
|
|
"cc/config/arm_device.go",
|
|
|
|
|
"cc/config/arm64_device.go",
|
2019-01-17 23:44:05 +01:00
|
|
|
"cc/config/arm64_fuchsia_device.go",
|
2016-07-29 22:44:28 +02:00
|
|
|
"cc/config/mips_device.go",
|
|
|
|
|
"cc/config/mips64_device.go",
|
|
|
|
|
"cc/config/x86_device.go",
|
|
|
|
|
"cc/config/x86_64_device.go",
|
2019-01-17 23:44:05 +01:00
|
|
|
"cc/config/x86_64_fuchsia_device.go",
|
2016-07-29 22:44:28 +02:00
|
|
|
|
|
|
|
|
"cc/config/x86_darwin_host.go",
|
|
|
|
|
"cc/config/x86_linux_host.go",
|
2016-06-14 02:19:03 +02:00
|
|
|
"cc/config/x86_linux_bionic_host.go",
|
2016-07-29 22:44:28 +02:00
|
|
|
"cc/config/x86_windows_host.go",
|
|
|
|
|
],
|
2016-09-27 00:45:04 +02:00
|
|
|
testSrcs: [
|
|
|
|
|
"cc/config/tidy_test.go",
|
|
|
|
|
],
|
2016-07-29 22:44:28 +02:00
|
|
|
}
|
|
|
|
|
|
2015-03-14 22:26:32 +01:00
|
|
|
bootstrap_go_package {
|
|
|
|
|
name: "soong-cc",
|
|
|
|
|
pkgPath: "android/soong/cc",
|
|
|
|
|
deps: [
|
2015-01-31 02:27:36 +01:00
|
|
|
"blueprint",
|
|
|
|
|
"blueprint-pathtools",
|
2015-06-17 23:20:06 +02:00
|
|
|
"soong",
|
2016-05-19 00:37:25 +02:00
|
|
|
"soong-android",
|
2016-07-29 22:44:28 +02:00
|
|
|
"soong-cc-config",
|
2015-03-18 21:28:46 +01:00
|
|
|
"soong-genrule",
|
2018-08-08 01:49:25 +02:00
|
|
|
"soong-tradefed",
|
2015-01-31 02:27:36 +01:00
|
|
|
],
|
2015-03-14 22:26:32 +01:00
|
|
|
srcs: [
|
2015-07-09 03:13:11 +02:00
|
|
|
"cc/androidmk.go",
|
2015-01-31 02:27:36 +01:00
|
|
|
"cc/builder.go",
|
|
|
|
|
"cc/cc.go",
|
2019-10-22 07:39:18 +02:00
|
|
|
"cc/ccdeps.go",
|
2016-05-25 23:47:21 +02:00
|
|
|
"cc/check.go",
|
2017-02-10 01:16:31 +01:00
|
|
|
"cc/coverage.go",
|
2015-04-08 01:50:10 +02:00
|
|
|
"cc/gen.go",
|
2019-10-18 23:18:45 +02:00
|
|
|
"cc/linkable.go",
|
2017-05-10 00:44:35 +02:00
|
|
|
"cc/lto.go",
|
2016-01-13 08:20:28 +01:00
|
|
|
"cc/makevars.go",
|
2017-09-01 08:38:27 +02:00
|
|
|
"cc/pgo.go",
|
2016-10-07 01:12:58 +02:00
|
|
|
"cc/prebuilt.go",
|
2016-10-21 01:11:43 +02:00
|
|
|
"cc/proto.go",
|
2017-05-02 02:37:24 +02:00
|
|
|
"cc/rs.go",
|
2016-01-06 23:41:07 +01:00
|
|
|
"cc/sanitize.go",
|
2017-02-08 22:45:53 +01:00
|
|
|
"cc/sabi.go",
|
2019-11-15 01:59:12 +01:00
|
|
|
"cc/snapshot_utils.go",
|
2016-01-04 23:34:37 +01:00
|
|
|
"cc/stl.go",
|
2016-07-29 21:48:20 +02:00
|
|
|
"cc/strip.go",
|
2019-02-08 13:00:45 +01:00
|
|
|
"cc/sysprop.go",
|
2016-09-27 00:45:04 +02:00
|
|
|
"cc/tidy.go",
|
2015-01-31 02:27:36 +01:00
|
|
|
"cc/util.go",
|
2019-11-15 01:59:12 +01:00
|
|
|
"cc/vendor_snapshot.go",
|
2017-06-23 12:24:43 +02:00
|
|
|
"cc/vndk.go",
|
Install VNDK snapshot libraries for system build
When BOARD_VNDK_VERSION := <VNDK version>, or
PRODUCT_EXTRA_VNDK_VERSIONS includes the needed <VNDK version> list,
the prebuilt VNDK libs in prebuilts/vndk/ directory will be
installed.
Each prebuilt VNDK module uses "vndk_prebuilt_shared" for shared
VNDK/VNDK-SP libs.
Following is the sample configuration of a vndk snapshot module:
vndk_prebuilt_shared {
name: "libfoo",
version: "27",
vendor_available: true,
vndk: {
enabled: true,
},
arch: {
arm64: {
srcs: ["arm/lib64/libfoo.so"],
},
arm: {
srcs: ["arm/lib/libfoo.so"],
},
},
}
The Android.bp for the snapshot modules will be auto-generated by a
script.
Bug: 38304393
Bug: 65377115
Bug: 68123344
Test: set BOARD_VNDK_VERSION := 27
copy a snapshot for v27
build with make command
Change-Id: Ib93107530dbabb4a24583f4d6e4f0c513c9adfec
2017-11-17 04:10:28 +01:00
|
|
|
"cc/vndk_prebuilt.go",
|
2015-01-31 02:27:36 +01:00
|
|
|
|
2019-09-14 02:08:52 +02:00
|
|
|
"cc/cflag_artifacts.go",
|
2017-01-11 01:21:22 +01:00
|
|
|
"cc/cmakelists.go",
|
2018-04-18 01:50:48 +02:00
|
|
|
"cc/compdb.go",
|
2016-07-29 21:48:20 +02:00
|
|
|
"cc/compiler.go",
|
|
|
|
|
"cc/installer.go",
|
|
|
|
|
"cc/linker.go",
|
|
|
|
|
|
|
|
|
|
"cc/binary.go",
|
2020-01-16 12:47:25 +01:00
|
|
|
"cc/binary_sdk_member.go",
|
2019-07-15 18:34:09 +02:00
|
|
|
"cc/fuzz.go",
|
2016-07-29 21:48:20 +02:00
|
|
|
"cc/library.go",
|
2020-02-21 11:28:43 +01:00
|
|
|
"cc/library_headers.go",
|
2019-12-13 11:40:56 +01:00
|
|
|
"cc/library_sdk_member.go",
|
2016-07-29 21:48:20 +02:00
|
|
|
"cc/object.go",
|
|
|
|
|
"cc/test.go",
|
2016-07-30 02:28:03 +02:00
|
|
|
"cc/toolchain_library.go",
|
2016-07-29 21:48:20 +02:00
|
|
|
|
|
|
|
|
"cc/ndk_prebuilt.go",
|
2016-06-18 01:45:24 +02:00
|
|
|
"cc/ndk_headers.go",
|
|
|
|
|
"cc/ndk_library.go",
|
|
|
|
|
"cc/ndk_sysroot.go",
|
2017-03-19 21:44:32 +01:00
|
|
|
|
|
|
|
|
"cc/llndk_library.go",
|
2017-07-03 06:18:12 +02:00
|
|
|
|
|
|
|
|
"cc/kernel_headers.go",
|
2017-09-14 03:37:08 +02:00
|
|
|
|
|
|
|
|
"cc/genrule.go",
|
Allow platform modules to link to vendor public libraries
Normally, when building with VNDK, platform modules are not allowed to
link against vendor libraries, because the ABI of the vendor libraries
are not guaranteed to be stable and may differ across multiple vendor
images.
However, the vendor public libraries are the exceptions. Vendor public
libraries are vendor libraries that are exposed to 3rd party apps and
listed in /vendor/etc/public.libraries.txt. Since they are intended to
be exposed to public, their ABI stability is guaranteed (by definition,
though it is up to the vendor to actually guarantee it).
This change provides a way to make a vendor lib as public by defining a
module of type 'vendor_public_library' with a map file that enumerates
public symbols that are publicized:
cc_library {
name: "libvendor",
proprietary: true,
...
}
vendor_public_library {
name: "libvendor",
symbol_file: "libvendor.map.txt",
}
This defines a stub library module named libvendor.vendorpublic from the
map file. `shared_libs: ["libvendor"]` is redirected to the stub library
when it is from the outside of the vendor partition.
Bug: 74275385
Test: m -j
Test: cc_test.go passes
Change-Id: I5bed94d7c4282b777632ab2f0fb63c203ee313ba
2018-03-19 10:23:01 +01:00
|
|
|
|
|
|
|
|
"cc/vendor_public_library.go",
|
2019-02-08 13:00:45 +01:00
|
|
|
|
|
|
|
|
"cc/testing.go",
|
2015-01-31 02:27:36 +01:00
|
|
|
],
|
2015-06-24 04:46:20 +02:00
|
|
|
testSrcs: [
|
|
|
|
|
"cc/cc_test.go",
|
2019-10-08 11:27:17 +02:00
|
|
|
"cc/compiler_test.go",
|
2017-11-16 23:33:08 +01:00
|
|
|
"cc/gen_test.go",
|
2018-10-23 20:27:50 +02:00
|
|
|
"cc/genrule_test.go",
|
2020-02-21 11:28:43 +01:00
|
|
|
"cc/library_headers_test.go",
|
2017-11-16 23:29:11 +01:00
|
|
|
"cc/library_test.go",
|
2019-08-16 21:25:06 +02:00
|
|
|
"cc/object_test.go",
|
2019-05-14 23:07:01 +02:00
|
|
|
"cc/prebuilt_test.go",
|
2019-03-28 22:45:07 +01:00
|
|
|
"cc/proto_test.go",
|
2017-02-01 23:12:44 +01:00
|
|
|
"cc/test_data_test.go",
|
2015-06-24 04:46:20 +02:00
|
|
|
],
|
2015-07-28 00:08:24 +02:00
|
|
|
pluginFor: ["soong_build"],
|
2015-03-14 22:26:32 +01:00
|
|
|
}
|
2015-01-31 02:27:36 +01:00
|
|
|
|
2015-03-18 21:28:46 +01:00
|
|
|
bootstrap_go_package {
|
|
|
|
|
name: "soong-genrule",
|
|
|
|
|
pkgPath: "android/soong/genrule",
|
|
|
|
|
deps: [
|
|
|
|
|
"blueprint",
|
|
|
|
|
"blueprint-pathtools",
|
2015-06-17 23:20:06 +02:00
|
|
|
"soong",
|
2016-05-19 00:37:25 +02:00
|
|
|
"soong-android",
|
2017-03-30 02:29:06 +02:00
|
|
|
"soong-shared",
|
2015-03-18 21:28:46 +01:00
|
|
|
],
|
|
|
|
|
srcs: [
|
|
|
|
|
"genrule/genrule.go",
|
|
|
|
|
],
|
2018-10-05 08:28:25 +02:00
|
|
|
testSrcs: [
|
|
|
|
|
"genrule/genrule_test.go",
|
|
|
|
|
],
|
2015-07-28 00:08:24 +02:00
|
|
|
pluginFor: ["soong_build"],
|
2015-03-18 21:28:46 +01:00
|
|
|
}
|
2015-03-31 02:20:39 +02:00
|
|
|
|
2017-02-05 02:47:46 +01:00
|
|
|
bootstrap_go_package {
|
|
|
|
|
name: "soong-phony",
|
|
|
|
|
pkgPath: "android/soong/phony",
|
|
|
|
|
deps: [
|
|
|
|
|
"blueprint",
|
|
|
|
|
"soong-android",
|
|
|
|
|
],
|
|
|
|
|
srcs: [
|
|
|
|
|
"phony/phony.go",
|
|
|
|
|
],
|
|
|
|
|
pluginFor: ["soong_build"],
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-31 02:20:39 +02:00
|
|
|
bootstrap_go_package {
|
|
|
|
|
name: "soong-java",
|
|
|
|
|
pkgPath: "android/soong/java",
|
|
|
|
|
deps: [
|
|
|
|
|
"blueprint",
|
|
|
|
|
"blueprint-pathtools",
|
2015-06-17 23:20:06 +02:00
|
|
|
"soong",
|
2016-05-19 00:37:25 +02:00
|
|
|
"soong-android",
|
2018-10-03 07:03:40 +02:00
|
|
|
"soong-cc",
|
2018-11-12 19:13:39 +01:00
|
|
|
"soong-dexpreopt",
|
2015-04-28 22:28:51 +02:00
|
|
|
"soong-genrule",
|
2017-06-23 02:20:19 +02:00
|
|
|
"soong-java-config",
|
2018-08-08 01:49:25 +02:00
|
|
|
"soong-tradefed",
|
2015-03-31 02:20:39 +02:00
|
|
|
],
|
|
|
|
|
srcs: [
|
2017-11-23 01:19:37 +01:00
|
|
|
"java/aapt2.go",
|
2018-02-21 02:22:23 +01:00
|
|
|
"java/aar.go",
|
2018-05-25 01:11:20 +02:00
|
|
|
"java/android_manifest.go",
|
2018-03-28 23:58:31 +02:00
|
|
|
"java/android_resources.go",
|
2015-07-09 03:13:11 +02:00
|
|
|
"java/androidmk.go",
|
2015-04-13 22:58:27 +02:00
|
|
|
"java/app_builder.go",
|
|
|
|
|
"java/app.go",
|
2015-03-31 02:20:39 +02:00
|
|
|
"java/builder.go",
|
2019-03-01 22:46:24 +01:00
|
|
|
"java/device_host_converter.go",
|
2017-12-23 00:56:08 +01:00
|
|
|
"java/dex.go",
|
2018-11-12 19:13:39 +01:00
|
|
|
"java/dexpreopt.go",
|
2019-02-11 23:21:24 +01:00
|
|
|
"java/dexpreopt_bootjars.go",
|
2019-02-16 08:06:46 +01:00
|
|
|
"java/dexpreopt_config.go",
|
2018-01-11 01:06:12 +01:00
|
|
|
"java/droiddoc.go",
|
2015-04-08 22:03:43 +02:00
|
|
|
"java/gen.go",
|
2017-12-05 18:28:08 +01:00
|
|
|
"java/genrule.go",
|
2019-01-17 00:15:52 +01:00
|
|
|
"java/hiddenapi.go",
|
2019-01-31 23:12:44 +01:00
|
|
|
"java/hiddenapi_singleton.go",
|
2017-11-22 22:49:43 +01:00
|
|
|
"java/jacoco.go",
|
2015-03-31 02:20:39 +02:00
|
|
|
"java/java.go",
|
2018-08-16 00:35:38 +02:00
|
|
|
"java/jdeps.go",
|
2018-03-28 23:58:31 +02:00
|
|
|
"java/java_resources.go",
|
2019-01-19 00:05:09 +01:00
|
|
|
"java/kotlin.go",
|
2019-08-05 13:26:07 +02:00
|
|
|
"java/platform_compat_config.go",
|
2019-01-22 06:37:16 +01:00
|
|
|
"java/plugin.go",
|
2018-05-12 15:29:12 +02:00
|
|
|
"java/prebuilt_apis.go",
|
2017-09-20 21:59:05 +02:00
|
|
|
"java/proto.go",
|
2019-05-02 00:50:51 +02:00
|
|
|
"java/robolectric.go",
|
2019-01-10 07:17:55 +01:00
|
|
|
"java/sdk.go",
|
2018-04-10 06:07:10 +02:00
|
|
|
"java/sdk_library.go",
|
2018-04-20 00:26:10 +02:00
|
|
|
"java/support_libraries.go",
|
2019-12-09 10:15:47 +01:00
|
|
|
"java/sysprop.go",
|
2017-09-30 02:58:17 +02:00
|
|
|
"java/system_modules.go",
|
2019-02-15 19:37:39 +01:00
|
|
|
"java/testing.go",
|
2019-10-16 01:36:40 +02:00
|
|
|
"java/tradefed.go",
|
2015-03-31 02:20:39 +02:00
|
|
|
],
|
2017-07-14 01:23:21 +02:00
|
|
|
testSrcs: [
|
2019-07-11 09:18:47 +02:00
|
|
|
"java/androidmk_test.go",
|
2017-11-29 09:17:36 +01:00
|
|
|
"java/app_test.go",
|
2019-03-01 22:46:24 +01:00
|
|
|
"java/device_host_converter_test.go",
|
2019-01-06 07:12:12 +01:00
|
|
|
"java/dexpreopt_test.go",
|
2019-02-26 01:40:34 +01:00
|
|
|
"java/dexpreopt_bootjars_test.go",
|
2017-07-14 01:23:21 +02:00
|
|
|
"java/java_test.go",
|
2018-08-16 00:35:38 +02:00
|
|
|
"java/jdeps_test.go",
|
2019-01-19 00:05:09 +01:00
|
|
|
"java/kotlin_test.go",
|
2019-01-22 06:37:16 +01:00
|
|
|
"java/plugin_test.go",
|
2019-01-10 07:17:55 +01:00
|
|
|
"java/sdk_test.go",
|
2017-07-14 01:23:21 +02:00
|
|
|
],
|
2015-07-28 00:08:24 +02:00
|
|
|
pluginFor: ["soong_build"],
|
2015-03-31 02:20:39 +02:00
|
|
|
}
|
|
|
|
|
|
2017-06-23 02:20:19 +02:00
|
|
|
bootstrap_go_package {
|
|
|
|
|
name: "soong-java-config",
|
|
|
|
|
pkgPath: "android/soong/java/config",
|
|
|
|
|
deps: [
|
|
|
|
|
"blueprint-proptools",
|
|
|
|
|
"soong-android",
|
|
|
|
|
],
|
|
|
|
|
srcs: [
|
|
|
|
|
"java/config/config.go",
|
2017-09-05 22:16:45 +02:00
|
|
|
"java/config/error_prone.go",
|
2017-08-15 22:34:18 +02:00
|
|
|
"java/config/kotlin.go",
|
2017-06-23 02:20:19 +02:00
|
|
|
"java/config/makevars.go",
|
|
|
|
|
],
|
|
|
|
|
}
|
|
|
|
|
|
2019-08-27 21:03:00 +02:00
|
|
|
bootstrap_go_package {
|
|
|
|
|
name: "soong-rust-config",
|
|
|
|
|
pkgPath: "android/soong/rust/config",
|
|
|
|
|
deps: [
|
|
|
|
|
"soong-android",
|
|
|
|
|
"soong-cc-config",
|
|
|
|
|
],
|
|
|
|
|
srcs: [
|
2019-09-20 22:45:59 +02:00
|
|
|
"rust/config/arm_device.go",
|
2019-09-20 20:00:37 +02:00
|
|
|
"rust/config/arm64_device.go",
|
2019-08-27 21:03:00 +02:00
|
|
|
"rust/config/global.go",
|
|
|
|
|
"rust/config/toolchain.go",
|
2019-09-18 17:42:54 +02:00
|
|
|
"rust/config/whitelist.go",
|
2019-10-21 18:57:38 +02:00
|
|
|
"rust/config/x86_darwin_host.go",
|
2019-08-27 21:03:00 +02:00
|
|
|
"rust/config/x86_linux_host.go",
|
2019-12-12 00:25:47 +01:00
|
|
|
"rust/config/x86_device.go",
|
2019-08-27 21:03:00 +02:00
|
|
|
"rust/config/x86_64_device.go",
|
|
|
|
|
],
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bootstrap_go_package {
|
|
|
|
|
name: "soong-rust",
|
|
|
|
|
pkgPath: "android/soong/rust",
|
|
|
|
|
deps: [
|
|
|
|
|
"soong",
|
|
|
|
|
"soong-android",
|
|
|
|
|
"soong-cc",
|
|
|
|
|
"soong-rust-config",
|
|
|
|
|
],
|
|
|
|
|
srcs: [
|
|
|
|
|
"rust/androidmk.go",
|
|
|
|
|
"rust/compiler.go",
|
|
|
|
|
"rust/binary.go",
|
|
|
|
|
"rust/builder.go",
|
|
|
|
|
"rust/library.go",
|
|
|
|
|
"rust/prebuilt.go",
|
|
|
|
|
"rust/proc_macro.go",
|
|
|
|
|
"rust/rust.go",
|
2019-10-25 05:47:54 +02:00
|
|
|
"rust/test.go",
|
2019-08-27 21:03:00 +02:00
|
|
|
"rust/testing.go",
|
|
|
|
|
],
|
|
|
|
|
testSrcs: [
|
|
|
|
|
"rust/binary_test.go",
|
|
|
|
|
"rust/compiler_test.go",
|
|
|
|
|
"rust/library_test.go",
|
|
|
|
|
"rust/rust_test.go",
|
2019-10-25 05:47:54 +02:00
|
|
|
"rust/test_test.go",
|
2019-08-27 21:03:00 +02:00
|
|
|
],
|
|
|
|
|
pluginFor: ["soong_build"],
|
|
|
|
|
}
|
|
|
|
|
|
2017-02-27 19:12:13 +01:00
|
|
|
bootstrap_go_package {
|
|
|
|
|
name: "soong-python",
|
|
|
|
|
pkgPath: "android/soong/python",
|
|
|
|
|
deps: [
|
|
|
|
|
"blueprint",
|
|
|
|
|
"soong-android",
|
2018-11-06 04:49:55 +01:00
|
|
|
"soong-tradefed",
|
2017-02-27 19:12:13 +01:00
|
|
|
],
|
|
|
|
|
srcs: [
|
2017-05-10 22:37:54 +02:00
|
|
|
"python/androidmk.go",
|
2017-02-27 19:12:13 +01:00
|
|
|
"python/binary.go",
|
|
|
|
|
"python/builder.go",
|
2017-07-21 02:43:37 +02:00
|
|
|
"python/defaults.go",
|
2017-05-10 22:37:54 +02:00
|
|
|
"python/installer.go",
|
2017-02-27 19:12:13 +01:00
|
|
|
"python/library.go",
|
2017-12-23 01:12:00 +01:00
|
|
|
"python/proto.go",
|
2017-02-27 19:12:13 +01:00
|
|
|
"python/python.go",
|
2017-05-10 22:37:54 +02:00
|
|
|
"python/test.go",
|
2017-02-27 19:12:13 +01:00
|
|
|
],
|
|
|
|
|
testSrcs: [
|
|
|
|
|
"python/python_test.go",
|
|
|
|
|
],
|
|
|
|
|
pluginFor: ["soong_build"],
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-30 02:29:06 +02:00
|
|
|
bootstrap_go_package {
|
|
|
|
|
name: "soong-shared",
|
|
|
|
|
pkgPath: "android/soong/shared",
|
|
|
|
|
srcs: [
|
|
|
|
|
"shared/paths.go",
|
|
|
|
|
],
|
|
|
|
|
}
|
|
|
|
|
|
2018-08-08 01:49:25 +02:00
|
|
|
bootstrap_go_package {
|
|
|
|
|
name: "soong-tradefed",
|
|
|
|
|
pkgPath: "android/soong/tradefed",
|
|
|
|
|
deps: [
|
|
|
|
|
"blueprint",
|
|
|
|
|
"soong-android",
|
|
|
|
|
],
|
|
|
|
|
srcs: [
|
|
|
|
|
"tradefed/autogen.go",
|
|
|
|
|
"tradefed/config.go",
|
|
|
|
|
"tradefed/makevars.go",
|
|
|
|
|
],
|
|
|
|
|
pluginFor: ["soong_build"],
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-25 15:57:34 +02:00
|
|
|
bootstrap_go_package {
|
|
|
|
|
name: "soong-xml",
|
|
|
|
|
pkgPath: "android/soong/xml",
|
|
|
|
|
deps: [
|
|
|
|
|
"blueprint",
|
|
|
|
|
"blueprint-pathtools",
|
|
|
|
|
"soong",
|
|
|
|
|
"soong-android",
|
|
|
|
|
],
|
|
|
|
|
srcs: [
|
|
|
|
|
"xml/xml.go",
|
|
|
|
|
],
|
|
|
|
|
testSrcs: [
|
|
|
|
|
"xml/xml_test.go",
|
|
|
|
|
],
|
|
|
|
|
pluginFor: ["soong_build"],
|
|
|
|
|
}
|
|
|
|
|
|
2018-10-10 07:01:00 +02:00
|
|
|
bootstrap_go_package {
|
|
|
|
|
name: "soong-apex",
|
|
|
|
|
pkgPath: "android/soong/apex",
|
|
|
|
|
deps: [
|
|
|
|
|
"blueprint",
|
|
|
|
|
"soong",
|
|
|
|
|
"soong-android",
|
|
|
|
|
"soong-cc",
|
|
|
|
|
"soong-java",
|
2019-02-27 23:19:50 +01:00
|
|
|
"soong-python",
|
2018-10-10 07:01:00 +02:00
|
|
|
],
|
|
|
|
|
srcs: [
|
2019-11-18 03:16:27 +01:00
|
|
|
"apex/androidmk.go",
|
2018-10-10 07:01:00 +02:00
|
|
|
"apex/apex.go",
|
2019-11-18 03:16:27 +01:00
|
|
|
"apex/builder.go",
|
2018-10-12 14:49:38 +02:00
|
|
|
"apex/key.go",
|
2019-11-18 03:16:27 +01:00
|
|
|
"apex/prebuilt.go",
|
|
|
|
|
"apex/vndk.go",
|
2018-10-10 07:01:00 +02:00
|
|
|
],
|
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
|
|
|
testSrcs: [
|
|
|
|
|
"apex/apex_test.go",
|
2020-01-23 06:36:59 +01:00
|
|
|
"apex/vndk_test.go",
|
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
|
|
|
],
|
2018-10-10 07:01:00 +02:00
|
|
|
pluginFor: ["soong_build"],
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-08 13:00:45 +01:00
|
|
|
bootstrap_go_package {
|
|
|
|
|
name: "soong-sysprop",
|
|
|
|
|
pkgPath: "android/soong/sysprop",
|
|
|
|
|
deps: [
|
|
|
|
|
"blueprint",
|
|
|
|
|
"soong",
|
|
|
|
|
"soong-android",
|
|
|
|
|
"soong-cc",
|
|
|
|
|
"soong-java",
|
|
|
|
|
],
|
|
|
|
|
srcs: [
|
|
|
|
|
"sysprop/sysprop_library.go",
|
|
|
|
|
],
|
|
|
|
|
testSrcs: [
|
|
|
|
|
"sysprop/sysprop_test.go",
|
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
|
|
|
],
|
|
|
|
|
pluginFor: ["soong_build"],
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bootstrap_go_package {
|
|
|
|
|
name: "soong-sdk",
|
|
|
|
|
pkgPath: "android/soong/sdk",
|
|
|
|
|
deps: [
|
|
|
|
|
"blueprint",
|
|
|
|
|
"soong",
|
|
|
|
|
"soong-android",
|
|
|
|
|
"soong-apex",
|
|
|
|
|
"soong-cc",
|
|
|
|
|
"soong-java",
|
|
|
|
|
],
|
|
|
|
|
srcs: [
|
2019-11-27 18:43:54 +01:00
|
|
|
"sdk/bp.go",
|
2019-12-16 18:21:27 +01:00
|
|
|
"sdk/exports.go",
|
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
|
|
|
"sdk/sdk.go",
|
2019-10-11 07:59:13 +02:00
|
|
|
"sdk/update.go",
|
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
|
|
|
],
|
|
|
|
|
testSrcs: [
|
2019-12-03 16:25:00 +01:00
|
|
|
"sdk/cc_sdk_test.go",
|
2019-12-16 18:21:27 +01:00
|
|
|
"sdk/exports_test.go",
|
2019-12-03 16:25:00 +01:00
|
|
|
"sdk/java_sdk_test.go",
|
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
|
|
|
"sdk/sdk_test.go",
|
2019-11-30 10:24:33 +01:00
|
|
|
"sdk/testing.go",
|
2019-02-08 13:00:45 +01:00
|
|
|
],
|
|
|
|
|
pluginFor: ["soong_build"],
|
|
|
|
|
}
|
|
|
|
|
|
2016-11-17 09:25:59 +01:00
|
|
|
//
|
|
|
|
|
// Defaults to enable various configurations of host bionic
|
|
|
|
|
//
|
|
|
|
|
|
|
|
|
|
cc_defaults {
|
|
|
|
|
name: "linux_bionic_supported",
|
|
|
|
|
host_supported: true,
|
|
|
|
|
target: {
|
|
|
|
|
host: {
|
|
|
|
|
enabled: false,
|
|
|
|
|
},
|
|
|
|
|
linux_bionic: {
|
|
|
|
|
enabled: true,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-14 22:28:22 +01:00
|
|
|
//
|
|
|
|
|
// C static libraries extracted from the gcc toolchain
|
|
|
|
|
//
|
|
|
|
|
|
2015-03-14 22:26:32 +01:00
|
|
|
toolchain_library {
|
|
|
|
|
name: "libatomic",
|
2016-11-17 10:02:25 +01:00
|
|
|
defaults: ["linux_bionic_supported"],
|
Split /system and /vendor modules, allow multi-installation
Nothing changes if BOARD_VNDK_VERSION isn't set.
When the VNDK is enabled (BOARD_VNDK_VERSION in Make), this will split
/system and /vendor modules into two different variant spaces that can't
link to each other. There are a few interfaces between the two variant
spaces:
The `llndk_library` stubs will be available in the /vendor variant, but
won't be installed, so at runtime the /system variant will be used.
Setting `vendor_available: true` will split a module into both variants.
The /system (or "core") variant will compile just like today. The
/vendor ("vendor") variant will compile against everything else in the
vendor space (so LL-NDK instead of libc/liblog/etc). There will be two
copies of these libraries installed onto the final device.
Since the available runtime interfaces for vendor modules may be
reduced, and your dependencies may not expose their private interfaces,
we allow the vendor variants to reduce their compilation set, and export
a different set of headers:
cc_library {
name: "libfoo",
srcs: ["common.cpp", "private_impl.cpp"],
export_include_dirs: ["include"],
target: {
vendor: {
export_include_dirs: ["include_vndk"],
exclude_srcs: ["private_impl.cpp"],
srcs: ["vendor_only.cpp"],
},
},
}
So the "core" variant would compile with both "common.cpp" and
"private_impl.cpp", and export "include".
The "vendor" variant would compile "common.cpp" and "vendor_only.cpp",
and export "include_vndk".
Bug: 36426473
Bug: 36079834
Test: out/soong/build.ninja, out/soong/Android- only changes due to _core addition and
.llndk -> .vendor
Test: attempt to compile with BOARD_VNDK_VERSION:=current
Change-Id: Idef28764043bf6c33dc0d2e7e2026c38867ff769
2017-04-06 21:43:22 +02:00
|
|
|
vendor_available: true,
|
2020-01-22 01:38:29 +01:00
|
|
|
ramdisk_available: true,
|
2018-01-31 16:54:12 +01:00
|
|
|
recovery_available: true,
|
2019-03-26 12:39:31 +01:00
|
|
|
native_bridge_supported: true,
|
2018-10-08 03:16:48 +02:00
|
|
|
|
2015-07-09 03:11:14 +02:00
|
|
|
arch: {
|
|
|
|
|
arm: {
|
2018-10-08 03:16:48 +02:00
|
|
|
src: "prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/arm-linux-androideabi/lib/libatomic.a",
|
|
|
|
|
},
|
|
|
|
|
arm64: {
|
|
|
|
|
src: "prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/aarch64-linux-android/lib64/libatomic.a",
|
|
|
|
|
},
|
|
|
|
|
x86: {
|
|
|
|
|
src: "prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/lib/libatomic.a",
|
|
|
|
|
},
|
|
|
|
|
x86_64: {
|
|
|
|
|
src: "prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/lib64/libatomic.a",
|
2015-07-09 03:11:14 +02:00
|
|
|
},
|
|
|
|
|
},
|
2015-03-14 22:26:32 +01:00
|
|
|
}
|
2015-01-31 02:27:36 +01:00
|
|
|
|
2015-03-14 22:26:32 +01:00
|
|
|
toolchain_library {
|
|
|
|
|
name: "libgcc",
|
2016-11-17 10:02:25 +01:00
|
|
|
defaults: ["linux_bionic_supported"],
|
Split /system and /vendor modules, allow multi-installation
Nothing changes if BOARD_VNDK_VERSION isn't set.
When the VNDK is enabled (BOARD_VNDK_VERSION in Make), this will split
/system and /vendor modules into two different variant spaces that can't
link to each other. There are a few interfaces between the two variant
spaces:
The `llndk_library` stubs will be available in the /vendor variant, but
won't be installed, so at runtime the /system variant will be used.
Setting `vendor_available: true` will split a module into both variants.
The /system (or "core") variant will compile just like today. The
/vendor ("vendor") variant will compile against everything else in the
vendor space (so LL-NDK instead of libc/liblog/etc). There will be two
copies of these libraries installed onto the final device.
Since the available runtime interfaces for vendor modules may be
reduced, and your dependencies may not expose their private interfaces,
we allow the vendor variants to reduce their compilation set, and export
a different set of headers:
cc_library {
name: "libfoo",
srcs: ["common.cpp", "private_impl.cpp"],
export_include_dirs: ["include"],
target: {
vendor: {
export_include_dirs: ["include_vndk"],
exclude_srcs: ["private_impl.cpp"],
srcs: ["vendor_only.cpp"],
},
},
}
So the "core" variant would compile with both "common.cpp" and
"private_impl.cpp", and export "include".
The "vendor" variant would compile "common.cpp" and "vendor_only.cpp",
and export "include_vndk".
Bug: 36426473
Bug: 36079834
Test: out/soong/build.ninja, out/soong/Android- only changes due to _core addition and
.llndk -> .vendor
Test: attempt to compile with BOARD_VNDK_VERSION:=current
Change-Id: Idef28764043bf6c33dc0d2e7e2026c38867ff769
2017-04-06 21:43:22 +02:00
|
|
|
vendor_available: true,
|
2018-01-31 16:54:12 +01:00
|
|
|
recovery_available: true,
|
2019-03-26 12:39:31 +01:00
|
|
|
native_bridge_supported: true,
|
2018-10-08 03:16:48 +02:00
|
|
|
|
2015-07-09 03:11:14 +02:00
|
|
|
arch: {
|
|
|
|
|
arm: {
|
2018-10-08 03:16:48 +02:00
|
|
|
src: "prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/lib/gcc/arm-linux-androideabi/4.9.x/libgcc.a",
|
|
|
|
|
},
|
|
|
|
|
arm64: {
|
|
|
|
|
src: "prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/lib/gcc/aarch64-linux-android/4.9.x/libgcc.a",
|
|
|
|
|
},
|
|
|
|
|
x86: {
|
|
|
|
|
src: "prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/lib/gcc/x86_64-linux-android/4.9.x/32/libgcc.a",
|
|
|
|
|
},
|
|
|
|
|
x86_64: {
|
|
|
|
|
src: "prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/lib/gcc/x86_64-linux-android/4.9.x/libgcc.a",
|
2015-07-09 03:11:14 +02:00
|
|
|
},
|
|
|
|
|
},
|
2015-03-14 22:26:32 +01:00
|
|
|
}
|
2015-01-31 02:27:36 +01:00
|
|
|
|
2019-03-30 04:05:14 +01:00
|
|
|
toolchain_library {
|
|
|
|
|
name: "libgcc_stripped",
|
|
|
|
|
defaults: ["linux_bionic_supported"],
|
|
|
|
|
vendor_available: true,
|
2020-01-22 01:38:29 +01:00
|
|
|
ramdisk_available: true,
|
2019-03-30 04:05:14 +01:00
|
|
|
recovery_available: true,
|
2019-05-06 10:58:10 +02:00
|
|
|
native_bridge_supported: true,
|
2019-12-11 03:37:45 +01:00
|
|
|
sdk_version: "current",
|
2019-03-30 04:05:14 +01:00
|
|
|
|
|
|
|
|
arch: {
|
|
|
|
|
arm: {
|
|
|
|
|
src: "prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/lib/gcc/arm-linux-androideabi/4.9.x/libgcc.a",
|
2019-10-15 11:01:19 +02:00
|
|
|
repack_objects_to_keep: ["unwind-arm.o", "libunwind.o", "pr-support.o"],
|
2019-03-30 04:05:14 +01:00
|
|
|
},
|
|
|
|
|
arm64: {
|
|
|
|
|
src: "prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/lib/gcc/aarch64-linux-android/4.9.x/libgcc.a",
|
2019-10-15 11:01:19 +02:00
|
|
|
repack_objects_to_keep: ["unwind-dw2.o", "unwind-dw2-fde-dip.o"],
|
2019-03-30 04:05:14 +01:00
|
|
|
},
|
|
|
|
|
x86: {
|
|
|
|
|
src: "prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/lib/gcc/x86_64-linux-android/4.9.x/32/libgcc.a",
|
2019-10-15 11:01:19 +02:00
|
|
|
repack_objects_to_keep: ["unwind-dw2.o", "unwind-dw2-fde-dip.o"],
|
2019-03-30 04:05:14 +01:00
|
|
|
},
|
|
|
|
|
x86_64: {
|
|
|
|
|
src: "prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/lib/gcc/x86_64-linux-android/4.9.x/libgcc.a",
|
2019-10-15 11:01:19 +02:00
|
|
|
repack_objects_to_keep: ["unwind-dw2.o", "unwind-dw2-fde-dip.o"],
|
2019-03-30 04:05:14 +01:00
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
2017-02-24 02:52:24 +01:00
|
|
|
toolchain_library {
|
|
|
|
|
name: "libwinpthread",
|
|
|
|
|
host_supported: true,
|
|
|
|
|
enabled: false,
|
|
|
|
|
target: {
|
|
|
|
|
windows: {
|
2017-09-19 08:19:12 +02:00
|
|
|
enabled: true,
|
2017-02-24 02:52:24 +01:00
|
|
|
},
|
2018-10-08 03:16:48 +02:00
|
|
|
windows_x86: {
|
|
|
|
|
src: "prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/lib32/libwinpthread.a",
|
|
|
|
|
},
|
|
|
|
|
windows_x86_64: {
|
|
|
|
|
src: "prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/lib/libwinpthread.a",
|
|
|
|
|
},
|
2017-02-24 02:52:24 +01:00
|
|
|
},
|
2018-11-16 22:26:43 +01:00
|
|
|
notice: ":mingw-libwinpthread-notice",
|
2017-02-24 02:52:24 +01:00
|
|
|
}
|
|
|
|
|
|
2015-03-14 22:26:32 +01:00
|
|
|
toolchain_library {
|
|
|
|
|
name: "libgcov",
|
2016-11-17 10:02:25 +01:00
|
|
|
defaults: ["linux_bionic_supported"],
|
2018-10-08 03:16:48 +02:00
|
|
|
|
2015-07-09 03:11:14 +02:00
|
|
|
arch: {
|
|
|
|
|
arm: {
|
2018-10-08 03:16:48 +02:00
|
|
|
src: "prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/lib/gcc/arm-linux-androideabi/4.9.x/libgcov.a",
|
|
|
|
|
},
|
|
|
|
|
arm64: {
|
|
|
|
|
src: "prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/lib/gcc/aarch64-linux-android/4.9.x/libgcov.a",
|
|
|
|
|
},
|
|
|
|
|
x86: {
|
|
|
|
|
src: "prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/lib/gcc/x86_64-linux-android/4.9.x/32/libgcov.a",
|
|
|
|
|
},
|
|
|
|
|
x86_64: {
|
|
|
|
|
src: "prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/lib/gcc/x86_64-linux-android/4.9.x/libgcov.a",
|
2015-07-09 03:11:14 +02:00
|
|
|
},
|
|
|
|
|
},
|
2015-03-14 22:26:32 +01:00
|
|
|
}
|
2017-07-03 06:18:12 +02:00
|
|
|
|
|
|
|
|
kernel_headers {
|
|
|
|
|
name: "device_kernel_headers",
|
|
|
|
|
vendor: true,
|
2018-08-22 00:51:20 +02:00
|
|
|
recovery_available: true,
|
2017-07-03 06:18:12 +02:00
|
|
|
}
|
2017-09-19 08:19:12 +02:00
|
|
|
|
|
|
|
|
cc_genrule {
|
|
|
|
|
name: "host_bionic_linker_asm",
|
|
|
|
|
host_supported: true,
|
|
|
|
|
device_supported: false,
|
|
|
|
|
target: {
|
|
|
|
|
linux_bionic: {
|
|
|
|
|
enabled: true,
|
|
|
|
|
},
|
2017-10-02 19:41:07 +02:00
|
|
|
linux_glibc: {
|
2017-09-19 08:19:12 +02:00
|
|
|
enabled: false,
|
|
|
|
|
},
|
|
|
|
|
darwin: {
|
|
|
|
|
enabled: false,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
tools: ["extract_linker"],
|
|
|
|
|
cmd: "$(location) -s $(out) $(in)",
|
|
|
|
|
srcs: [":linker"],
|
|
|
|
|
out: ["linker.s"],
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
cc_genrule {
|
2018-10-12 09:24:23 +02:00
|
|
|
name: "host_bionic_linker_flags",
|
2017-09-19 08:19:12 +02:00
|
|
|
host_supported: true,
|
|
|
|
|
device_supported: false,
|
|
|
|
|
target: {
|
|
|
|
|
linux_bionic: {
|
|
|
|
|
enabled: true,
|
|
|
|
|
},
|
2017-10-02 19:41:07 +02:00
|
|
|
linux_glibc: {
|
2017-09-19 08:19:12 +02:00
|
|
|
enabled: false,
|
|
|
|
|
},
|
|
|
|
|
darwin: {
|
|
|
|
|
enabled: false,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
tools: ["extract_linker"],
|
2018-10-12 09:24:23 +02:00
|
|
|
cmd: "$(location) -f $(out) $(in)",
|
2017-09-19 08:19:12 +02:00
|
|
|
srcs: [":linker"],
|
2018-10-12 09:24:23 +02:00
|
|
|
out: ["linker.flags"],
|
2017-09-19 08:19:12 +02:00
|
|
|
}
|
