Commit Graph

36225 Commits

Author SHA1 Message Date
Paul Duffin
8d817b70e6 Merge "Extract IsModuleInVersionedSdk" 2021-04-28 12:58:43 +00:00
Liz Kammer
2d52b2a03a Merge "Make GetDirectDep implementation match comment" am: 8e72286b68
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1688768

Change-Id: I09357fc7dd4c98a2427d589b5436ef8a9fdfbc86
2021-04-28 12:52:32 +00:00
Liz Kammer
8e72286b68 Merge "Make GetDirectDep implementation match comment" 2021-04-28 12:34:40 +00:00
Paul Duffin
ada6da8aa4 Merge "Extract generateUpdatableBcpPackagesRule from updatableBcpPackagesRule" am: 0e98e86a3c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686152

Change-Id: Ied7c71e4640bb1211a936082ac717a33c3f20ee6
2021-04-28 12:12:27 +00:00
Paul Duffin
497d026b5b Merge "Remove special handling of frameworks/base/config/boot-profile.txt" am: c2477e8224
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686151

Change-Id: I505dfa1cc46f792e9ea3149916d9e2bb73c3ce75
2021-04-28 12:12:08 +00:00
Paul Duffin
eec196310d Merge "Move bootFrameworkProfileRule to platform_bootclasspath" am: 9abfff5229
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686150

Change-Id: Ic7708ba73d414666f2ab2cc74e08a3aa8510cd1d
2021-04-28 12:10:54 +00:00
Paul Duffin
0e98e86a3c Merge "Extract generateUpdatableBcpPackagesRule from updatableBcpPackagesRule" 2021-04-28 12:01:23 +00:00
Paul Duffin
c2477e8224 Merge "Remove special handling of frameworks/base/config/boot-profile.txt" 2021-04-28 12:01:12 +00:00
Paul Duffin
9abfff5229 Merge "Move bootFrameworkProfileRule to platform_bootclasspath" 2021-04-28 11:52:45 +00:00
Lukacs T. Berki
667bb27363 Remove libc_syscalls from the denylist.
It looks like eakammer@'s aosp/1684105 fixed it.

Test: Presubmits.
Change-Id: I166344bbf82ec4e4273cf30b7bb369dcb8ec4442
2021-04-28 11:54:46 +02:00
Lukács T. Berki
637febe208 Merge "Allowlist libpropertyinfoparser." am: f28abd1097
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686214

Change-Id: I9ee4e35cc66771cb8b11400f72954174495e9012
2021-04-28 09:50:11 +00:00
Lukács T. Berki
f28abd1097 Merge "Allowlist libpropertyinfoparser." 2021-04-28 09:32:11 +00:00
Paul Duffin
44d1594081 Extract generateUpdatableBcpPackagesRule from updatableBcpPackagesRule
This simplifies the process of moving the updatableBcpPackagesRule to
the platform_bootclasspath by separating the gathering of the list of
updatable modules (which differs between the singleton and the
platform_bootclasspath module) from the gathering of the permitted
packages list and generation of the rule which are generally common.

Bug: 177892522
Test: lunch art_module_arm64
      m out/soong/module_arm64/dex_bootjars/updatable-bcp-packages.txt
      - make sure it is not affected by this change
Change-Id: I3cb64310f618059758a32cfe00d3745d52388e49
2021-04-28 09:03:46 +01:00
Paul Duffin
2ac45f019b Remove special handling of frameworks/base/config/boot-profile.txt
Previously, the method was run in repo manifests that did not include
the frameworks/base repository so it had to handle the file being
missing. However, now that this is being called from
platform_bootclasspath which is only defined in frameworks/base that
is no longer required.

Bug: 177892522
Test: m droid
Change-Id: I77fa5a204d1426a6be24a6f0b48e18f48f3dd908
2021-04-28 09:03:46 +01:00
Paul Duffin
ad19d3858e Move bootFrameworkProfileRule to platform_bootclasspath
Changes bootFrameworkProfileRule to use ModuleContext instead of
SingletonContext and moves the call from dexpreoptBootJar's
GenerateSingletonBuildActions method to platform_bootclasspath's
GenerateAndroidBuildActions.

Changing the context also allows the code to switch from
bootFrameworkProfileRule to GetGlobalSoongConfig.

Also extracts the shouldBuildBootImages function so it can be used by
platform_bootclasspath to preserve the existing behavior.

Bug: 177892522
Test: m droid
Change-Id: I30d3ca10be7f84348ad3aa9cc984dd15b8f6f4e9
2021-04-28 09:03:46 +01:00
Paul Duffin
510e829ea5 Merge "Automatically export bootclasspath_fragment stubs from sdk" am: 59dc69c2c7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1689068

Change-Id: I30ed21b847f8611342bd109574f51b2b16d67523
2021-04-28 07:17:34 +00:00
Paul Duffin
a4e28eb6ef Merge "Pass module to SdkMemberTypeDependencyTag.SdkMemberType" am: 6a77e77cf9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1689067

Change-Id: I7b2b78ac293511529f4479333c846961170f93e2
2021-04-28 07:16:32 +00:00
Paul Duffin
59dc69c2c7 Merge "Automatically export bootclasspath_fragment stubs from sdk" 2021-04-28 06:57:22 +00:00
Paul Duffin
6a77e77cf9 Merge "Pass module to SdkMemberTypeDependencyTag.SdkMemberType" 2021-04-28 06:56:59 +00:00
Lukacs T. Berki
497f17d227 Allowlist libpropertyinfoparser.
Or at least as much of it as needed for Bionic.

Bug: 186388932
Test: Presubmits.
Change-Id: Ic984f50a4869244cbdb6946dd9cca4d9e08445b7
2021-04-28 08:21:37 +02:00
Treehugger Robot
f2357893b6 Merge "Remove libdl_static from the deny list in light of http://aosp/1688405" am: 7001848182
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1688465

Change-Id: I552f96fabf904699f1a47be2d6a530c74cc7d888
2021-04-28 03:30:32 +00:00
Treehugger Robot
7001848182 Merge "Remove libdl_static from the deny list in light of http://aosp/1688405" 2021-04-28 03:15:37 +00:00
Colin Cross
e1f1e843e0 Merge "Remove llndk_headers" am: 09a2a2ce3a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687469

Change-Id: I79a595522332a3db95b41a02ed562c1527ca4165
2021-04-28 02:12:07 +00:00
Colin Cross
09a2a2ce3a Merge "Remove llndk_headers" 2021-04-28 01:53:47 +00:00
Rupert Shuttleworth
6036497a3c Remove libdl_static from the deny list in light of http://aosp/1688405
Unfortunately libdl has to stay on the deny list due to an unrelated clang error in CI.

Test: bazel build //bionic/... now works with libdl and libdl_static both removed from the deny list.

Test: ./build/bazel/ci/bp2build.sh passes locally

Change-Id: I1b3c3dd01bc535c73c2e88c81b7998fa7906b4c5
2021-04-27 20:25:21 -04:00
Dan Albert
b433bf7bed Generate rustdoc index.
Test: m rustdoc
Bug: http://b/162741284
Change-Id: I6e649cbae5e3ce38b43baed5d9623851e519b8d0
2021-04-27 17:12:02 -07:00
Paul Duffin
0c2e08312c Extract IsModuleInVersionedSdk
Bug: 177892522
Test: m nothing
Change-Id: I348d380a0d29abdd6a84420be52cc1b674f2a7ab
2021-04-28 00:39:52 +01:00
Christopher Parsons
bbd6afc3fd Merge "Mixed builds: propagate includes from cc_* targets" am: 1c4621af62
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1688945

Change-Id: If3c9b7759ed52b847446b7e717fc136889d33be9
2021-04-27 23:26:06 +00:00
Colin Cross
5271fea26c Remove global state from vendor public libraries
Remove the global list of vendor public library modules used to rewrite
dependencies from the vendor module to the stubs for system modules,
and replace it with building the stubs directly in the system variant
of the vendor module.

Bug: 178231622
Test: vendor_public_library_test.go
Change-Id: I826e69ffd507d7e85fa3d4d85b5157428c642143
2021-04-27 16:26:00 -07:00
Christopher Parsons
1c4621af62 Merge "Mixed builds: propagate includes from cc_* targets" 2021-04-27 23:10:33 +00:00
Paul Duffin
976b0e5bbb Automatically export bootclasspath_fragment stubs from sdk
This change makes the tag that is used to add dependencies onto stubs
from the bootclaspath_fragment module cause the dependency to be
automatically exported from the sdk. If the dependency is a
java_sdk_library then it will be as if it was added to the
java_sdk_libs property, otherwise it will be as if it was added to the
java_header_libs property instead.

Bug: 177892522
Test: m nothing
Change-Id: I97010c4342dd39415dba81a4395db7831410436e
2021-04-27 23:27:34 +01:00
Paul Duffin
eee466e439 Pass module to SdkMemberTypeDependencyTag.SdkMemberType
This change allows an SdkMemberTypeDependencyTag to select the
SdkMemberType to use to add a dependency based on the module.

Bug: 177892522
Test: m nothing
Change-Id: I2d6e51b615636dc7cd41da65808ef851dd8ae6ac
2021-04-27 23:23:20 +01:00
Roman Kiryanov
9d03d58442 Merge "Remove libqemu_pipe from minSdkVersionAllowlist" am: 5796db599f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1688970

Change-Id: Id549d226b8206a1902ede9008134ec1c99acc7f4
2021-04-27 22:11:33 +00:00
Roman Kiryanov
5796db599f Merge "Remove libqemu_pipe from minSdkVersionAllowlist" 2021-04-27 21:54:58 +00:00
Roman Kiryanov
fc48433640 Remove libqemu_pipe from minSdkVersionAllowlist
libqemu_pipe was retired.

Bug: 175046060
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I4ac17966ad2a7609a9d71b8884351d70b5996b9d
2021-04-27 13:05:48 -07:00
Liz Kammer
2b50ce669c Make GetDirectDep implementation match comment
The comment on the interface of GetDirectDep states if there are
multiple deps with different tags, the first will be returned; however,
the current behavior is to panic if there are multiple deps. The
behavior now:
* a single dep, return the module and tag
* a single module with different tags: return module with first tag
* multiple modules: panic
* no module: return nil, nil

Bug: 186488405
Test: ~/aosp/build/bazel/ci/bp2build.sh
Test: m nothing
Change-Id: Id1e7315e7874b4a683ad7357ed2793822315821f
2021-04-27 15:53:51 -04:00
Chris Parsons
f60ecf081e Mixed builds: propagate includes from cc_* targets
This allows us to remove libasync_safe from the mixed builds denylist.

Test: mixed_libc.sh CI script
Change-Id: Ibafd231284864078bf30340f919d39e5098843ce
2021-04-27 15:04:37 -04:00
Steven Moreland
f36a3ac8b8 more no include_dir
Add a few more paths.

Bug: N/A
Test: N/A
Change-Id: Ib9503c2c792c4e93e30be631406e7e8314e6af31
2021-04-27 18:03:55 +00:00
Paul Duffin
29b18b8c17 Merge "Extract default image specific logic from buildBootImage" am: 6d4de43833
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686149

Change-Id: I1cd64a036c7c00d7937e9801b309e2aefb459e04
2021-04-27 17:21:38 +00:00
Paul Duffin
c7cf6ac1e7 Merge "Simplify missing deps handling in buildBootImage" am: c42a738bc4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686148

Change-Id: If3ba77102465471104e3f001f878c4bb1615a257
2021-04-27 17:21:29 +00:00
Paul Duffin
b49dae2874 Merge "Remove panics from reportMissingVariationDependency" am: a75af16878
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686147

Change-Id: I837996812cb588662631bbc35badb88a2a6301a3
2021-04-27 17:20:41 +00:00
Paul Duffin
6d4de43833 Merge "Extract default image specific logic from buildBootImage" 2021-04-27 17:01:23 +00:00
Paul Duffin
c42a738bc4 Merge "Simplify missing deps handling in buildBootImage" 2021-04-27 17:00:42 +00:00
Paul Duffin
a75af16878 Merge "Remove panics from reportMissingVariationDependency" 2021-04-27 17:00:22 +00:00
Colin Cross
2e9f993439 Merge "Add support for cc_library_headers to replace llndk_headers" am: 8fb66f48c7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687471

Change-Id: Id427b137b951f53dd1d70d26ad41755311819d95
2021-04-27 16:53:43 +00:00
Colin Cross
e125ff0d7b Merge "Skip default dependencies for header libraries" am: 4ba70ab48e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687468

Change-Id: I2e40e73ea5099e88ed65bb8eaf6bea0c51b9ee42
2021-04-27 16:53:33 +00:00
Steven Moreland
294019346e Merge "start eating include_dirs from both ends" am: ac9dc817b8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687472

Change-Id: I4438c69719e627c40b459e5c2fb2351649b93876
2021-04-27 16:52:51 +00:00
Colin Cross
8fb66f48c7 Merge "Add support for cc_library_headers to replace llndk_headers" 2021-04-27 16:40:48 +00:00
Colin Cross
4ba70ab48e Merge "Skip default dependencies for header libraries" 2021-04-27 16:40:37 +00:00
Steven Moreland
ac9dc817b8 Merge "start eating include_dirs from both ends" 2021-04-27 16:34:24 +00:00