Commit Graph

35953 Commits

Author SHA1 Message Date
Nikita Ioffe
e7e0954fea Merge "Revert "Allow dependencies from platform variants to APEX modules."" am: 6f77314381 am: 72d1c2f38e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660243

Change-Id: I1ec9ee5982b1f6d2d82fbf46fdd2e3c2235d79bf
2021-04-01 15:44:27 +00:00
Nikita Ioffe
72d1c2f38e Merge "Revert "Allow dependencies from platform variants to APEX modules."" am: 6f77314381
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660243

Change-Id: I5632ea7d16b0efec256bfdf094946051f9221e58
2021-04-01 15:03:24 +00:00
Nikita Ioffe
6f77314381 Merge "Revert "Allow dependencies from platform variants to APEX modules."" 2021-04-01 14:22:53 +00:00
Nikita Ioffe
d64139f8e5 Revert "Allow dependencies from platform variants to APEX modules."
Revert submission 1658000

Reason for revert: Breaks full-eng build: b/184239856
Reverted Changes:
I4f8ead785:Avoid internal APEX stubs for libsigchain and clea...
I68affdf69:Allow dependencies from platform variants to APEX ...
I54b33784e:Rename libdexfile_external_static to libdexfile_st...
Id68ae9438:libdexfile_external is being replaced by libdexfil...
I12ac84eb4:libdexfile_external is replaced by libdexfile.
If05dbffc8:Rename libdexfile_external_static to libdexfile_st...
Ia011fa3a8:Merge libdexfile_external into libdexfile.

Change-Id: If494dc5385042a4620a76a9eadc1613ae0eb1655
2021-04-01 10:58:24 +00:00
Paul Duffin
8f1c917639 Merge "Remove apexFixtureFactory" am: abc89cf86b am: 4ec4ca02bd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660142

Change-Id: Ibf8f775bb108903a46c5de8a69b15280a7a493b0
2021-04-01 10:50:33 +00:00
Ulyana Trafimovich
03b10aea69 Merge "Emit a better error message in manifest_check.py." am: 400a1b1309 am: 5517ed23b7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660140

Change-Id: If66842ad78dd492daebf6555e1001e3e954ae4d0
2021-04-01 10:50:27 +00:00
Paul Duffin
5b58dd9070 Merge "Add a new platform_bootclasspath module type" am: 920e205e9d am: 4d662d84bd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655612

Change-Id: Ic8d6a98c69dfd8a8fc384f2e2e4b2c144282c0c5
2021-04-01 10:50:22 +00:00
Paul Duffin
4ec4ca02bd Merge "Remove apexFixtureFactory" am: abc89cf86b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660142

Change-Id: I9e0a781c0f3a41fb0a122a51eae59514b929fc48
2021-04-01 10:49:48 +00:00
Rupert Shuttleworth
273aa56fed Merge "Annotate bp2buildModuleDoNotConvertList with reasons for modules being blocked." am: 97c4304ca9 am: b094dbf747
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1661719

Change-Id: I80f5ee7a5b5215ee0bc8cea3128e9b1d96dda728
2021-04-01 10:49:45 +00:00
Paul Duffin
abc89cf86b Merge "Remove apexFixtureFactory" 2021-04-01 10:26:15 +00:00
Ulyana Trafimovich
5517ed23b7 Merge "Emit a better error message in manifest_check.py." am: 400a1b1309
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660140

Change-Id: I05d88e641f2c23fa630a456a9623a7aa1ccd8d93
2021-04-01 10:10:18 +00:00
Paul Duffin
4d662d84bd Merge "Add a new platform_bootclasspath module type" am: 920e205e9d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655612

Change-Id: Ib048f843f7e29cdd87db1016b993d2028d5e8da3
2021-04-01 10:10:09 +00:00
Rupert Shuttleworth
b094dbf747 Merge "Annotate bp2buildModuleDoNotConvertList with reasons for modules being blocked." am: 97c4304ca9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1661719

Change-Id: I31f7c3460595c2f87dc5bc43fb5cdb2db75ac84c
2021-04-01 10:03:11 +00:00
Ulyana Trafimovich
400a1b1309 Merge "Emit a better error message in manifest_check.py." 2021-04-01 09:58:15 +00:00
Paul Duffin
920e205e9d Merge "Add a new platform_bootclasspath module type" 2021-04-01 09:38:57 +00:00
Paul Duffin
284165afb5 Remove apexFixtureFactory
Bug: 182885307
Test: m nothing
Change-Id: I88c58bf6b4adda4017e54548748897c51c3f3aa1
2021-04-01 10:31:07 +01:00
Rupert Shuttleworth
97c4304ca9 Merge "Annotate bp2buildModuleDoNotConvertList with reasons for modules being blocked." 2021-04-01 09:17:12 +00:00
Martin Stjernholm
2e9cf54e07 Merge "Allow dependencies from platform variants to APEX modules." am: f8c9713fb8 am: 3311c129d4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1654679

Change-Id: I0a7909f63188596a5d5435258f4123b1e7ff9ae5
2021-04-01 08:18:58 +00:00
Martin Stjernholm
3311c129d4 Merge "Allow dependencies from platform variants to APEX modules." am: f8c9713fb8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1654679

Change-Id: I5c7f1abe0b76fe7392be039c03f0c2453a8e25a6
2021-04-01 07:37:21 +00:00
Martin Stjernholm
f8c9713fb8 Merge "Allow dependencies from platform variants to APEX modules." 2021-04-01 06:53:13 +00:00
Treehugger Robot
cab9b4b25c Merge ""current" is implicitly added to stubs.versions" am: 25c47a43a5 am: 4ce23de995
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1641782

Change-Id: Iccc85ac4a2c89e360b0c82fc61c06635e896bc43
2021-04-01 06:12:36 +00:00
Treehugger Robot
4ce23de995 Merge ""current" is implicitly added to stubs.versions" am: 25c47a43a5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1641782

Change-Id: I282a22d88d5eb9447cac06379d920400260a6bba
2021-04-01 05:30:50 +00:00
Treehugger Robot
25c47a43a5 Merge ""current" is implicitly added to stubs.versions" 2021-04-01 04:53:55 +00:00
Yi Kong
3ef89b207a Merge "Move gen_sorted_bss_symbols.sh to use LLVM binutils" am: 9d9e053964 am: dd19e029a5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1659997

Change-Id: Ib07c530738d5f6e61e3c16ae692070c7ccf0a386
2021-04-01 04:45:30 +00:00
Rupert Shuttleworth
760fb185be Annotate bp2buildModuleDoNotConvertList with reasons for modules being blocked.
Test: bp2build write; bazel build //bionic/...
Change-Id: I6065c945dbb8747c85aa554eefb355afe58d2078
2021-04-01 04:38:08 +00:00
Yi Kong
dd19e029a5 Merge "Move gen_sorted_bss_symbols.sh to use LLVM binutils" am: 9d9e053964
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1659997

Change-Id: Id8c53b797052a0ed422e512872d7500ddda383da
2021-04-01 03:56:26 +00:00
Yi Kong
9d9e053964 Merge "Move gen_sorted_bss_symbols.sh to use LLVM binutils" 2021-04-01 03:10:08 +00:00
Colin Cross
0295902294 Merge "Fix multiple copies of read-only files in sbox" am: 85920c9389 am: 2d4d403560
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660771

Change-Id: I5739ebbc68a07848605f33634f22f5c7f0b2afb8
2021-04-01 01:51:55 +00:00
Colin Cross
2d4d403560 Merge "Fix multiple copies of read-only files in sbox" am: 85920c9389
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660771

Change-Id: Id5fe4b0d8b4d276644458b4f1258893a002f1b8e
2021-04-01 01:33:17 +00:00
Treehugger Robot
e49ec6219a Merge "Add default group support for logical_partition" am: ce08a57bb1 am: 0c00222c5e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1657799

Change-Id: Ifa292097ec18d4372a4113590e8f0d8780e1bc1c
2021-04-01 01:33:09 +00:00
Colin Cross
85920c9389 Merge "Fix multiple copies of read-only files in sbox" 2021-04-01 01:09:45 +00:00
Jiyong Park
d4a3a137ed "current" is implicitly added to stubs.versions
So far, when a library `libfoo` has `stubs.versions: ["10", "11"]`, then
`shared_libs: ["libfoo"]` is linked to the version 11 of the stub.

This requires the author of `libfoo` to manually update the property
whenever a new version is introduced. Otherwise, clients are not able
to use the newly added APIs because the latest stub is for an old
version.

This change eliminates the need for manual updating. "current" version
is always implicitly added to `stubs.versions`. It is added even when
nothing is set on the property, if `stubs.symbol_file` is set. i.e.

```
cc_library {
    name: "libfoo",
    stubs: {
        symbol_file: "libfoo.map.txt",
	// no versions: [...] needed
    },
}

cc_library {
    name: "a_client",
    shared_libs: ["libfoo"],
    apex_available: ["myapex"],
    min_sdk_version: "29",
}

apex {
    name: "myapex",
    native_shared_libraries: ["a_client"],
    min_sdk_version: "29",
}
```

`a_client` links to the "current" stub of `libfoo` that has all symbols
shown in the map file.

Note that, above doesn't mean that the client has unlimited access to
APIs that are introduced even after the min_sdk_version of the client
(29 in this example). The use of such APIs still has to be guarded with
`__builtin_available` check.

Bug: N/A
Test: m
Change-Id: I70bb1600c18e74d36c6b24c3569d2149f02aaf96
2021-04-01 09:58:53 +09:00
Treehugger Robot
0c00222c5e Merge "Add default group support for logical_partition" am: ce08a57bb1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1657799

Change-Id: Iac93209083514c337fc09d75b6b8d148d4d85507
2021-04-01 00:49:01 +00:00
Treehugger Robot
ce08a57bb1 Merge "Add default group support for logical_partition" 2021-04-01 00:15:19 +00:00
Paul Duffin
9b05c66ed6 Merge "Remove unused java testing methods" am: 4aa7faf487 am: 3971c45155
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658077

Change-Id: Ie437167d5e6a58fa4457729170e57f677ff0ccfc
2021-03-31 23:23:10 +00:00
Paul Duffin
0d9785622c Merge "Convert testDexpreoptWithApexes to use test fixtures" am: bcaf0fcb55 am: 7eee85fcae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658076

Change-Id: I22ea15a18f4bfdb89aed61a5bb87a91f91c4d2f3
2021-03-31 23:23:04 +00:00
Paul Duffin
7904ca6ceb Merge "Convert TestApexPermittedPackagesRules to use test fixtures" am: b00c7ed2e8 am: 6f3f57cbd8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658075

Change-Id: I0fd47536798e00cc6bafad96ad522189aca2e953
2021-03-31 23:22:36 +00:00
Paul Duffin
3971c45155 Merge "Remove unused java testing methods" am: 4aa7faf487
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658077

Change-Id: I55beb41a60f7c77110143987534bf5e0200cf03a
2021-03-31 22:47:02 +00:00
Paul Duffin
7eee85fcae Merge "Convert testDexpreoptWithApexes to use test fixtures" am: bcaf0fcb55
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658076

Change-Id: I53a4b8bccc0069d1957e5b5637bcf6827e472a3d
2021-03-31 22:46:53 +00:00
Paul Duffin
6f3f57cbd8 Merge "Convert TestApexPermittedPackagesRules to use test fixtures" am: b00c7ed2e8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658075

Change-Id: I8f695e8d3efd6c54592c5eca3e5de6c940f55af4
2021-03-31 22:46:00 +00:00
Paul Duffin
bb7f1ac794 Add a new platform_bootclasspath module type
Initially, this is just a placeholder but functionality will be added
in follow up changes.

Bug: 177892522
Test: m nothing
Change-Id: I890b0d5a117c51a19c9ac5df98c766761d3aa16c
2021-03-31 22:44:34 +01:00
Paul Duffin
4aa7faf487 Merge "Remove unused java testing methods" 2021-03-31 21:41:42 +00:00
Paul Duffin
bcaf0fcb55 Merge "Convert testDexpreoptWithApexes to use test fixtures" 2021-03-31 21:41:00 +00:00
Paul Duffin
b00c7ed2e8 Merge "Convert TestApexPermittedPackagesRules to use test fixtures" 2021-03-31 21:40:09 +00:00
Treehugger Robot
895d2ff78a Merge "Do not build stats-log-api-gen-exports in mainline builds" am: fdfb9540f6 am: 1a7afb484c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1656192

Change-Id: I6d0dfea5e9c447d1d429388f68faee840ea0db2b
2021-03-31 20:32:03 +00:00
Liz Kammer
263bdc570c Merge "Handle product_variable asflag for cc_object." am: acacbc1166 am: 2cc845060d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652787

Change-Id: Id44d10eed084732f693e00896d990b1ccf57d08a
2021-03-31 20:31:47 +00:00
Liz Kammer
8ac144c6e6 Merge "Don't use custom mixed build logic for cc_object" am: 7dfaa3a732 am: 227e8e9493
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1615643

Change-Id: I4e8d3c51e2cd11415529ba547fd8619f7637ed27
2021-03-31 20:31:43 +00:00
Colin Cross
607c0b795c Fix multiple copies of read-only files in sbox
Sbox preserves the permissions of input files when copying them into the
sandbox.  A read-only file copied into the sandbox multiple times causes
a permission denied error on the second write.  Building in Bazel results
in more read-only files, which triggers the issue on existing sbox rules
with duplicate input files.  Remove the destination file when copying if
it exists.

Bug: 184113103
Test: m USE_BAZEL=true
Change-Id: I7edf92d82b766100e3cbbd90d22428269d7d0167
2021-03-31 13:17:42 -07:00
Treehugger Robot
1a7afb484c Merge "Do not build stats-log-api-gen-exports in mainline builds" am: fdfb9540f6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1656192

Change-Id: Icc3d770747da437c9e98d92eb4ebe99591fc4136
2021-03-31 19:55:37 +00:00
Liz Kammer
2cc845060d Merge "Handle product_variable asflag for cc_object." am: acacbc1166
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652787

Change-Id: If76000e28e7499243a87a5811852a62350dbe5a0
2021-03-31 19:51:48 +00:00