Commit Graph

35970 Commits

Author SHA1 Message Date
Jaewoong Jung
f88946c3ac Merge "Add min_sdk_version to java_import." am: 51a0d85ebc am: e37f90021f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660819

Change-Id: I60383180f51abf45cd68016a5ceef6900b96d5ab
2021-04-01 20:54:23 +00:00
Jaewoong Jung
e37f90021f Merge "Add min_sdk_version to java_import." am: 51a0d85ebc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660819

Change-Id: I3910928b88293464faa18d4a6c1a0b1e6d1871a9
2021-04-01 20:12:41 +00:00
Lukács T. Berki
764a663c62 Merge "Reorganize soong_build/main.go ." am: c5b3a1722c am: ae5bf80c7c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1662203

Change-Id: I03a8caeedba41310fd156e15c4037ae539cf1ec9
2021-04-01 19:51:25 +00:00
Paul Duffin
7488d8c41e Merge "Convert remaining rust tests to use test fixtures" am: e6165d0f46 am: cdc1757b07
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658074

Change-Id: Ibfb0e8c37e920f41a2bdcb6603fd2cb93b9bef06
2021-04-01 19:51:16 +00:00
Jaewoong Jung
51a0d85ebc Merge "Add min_sdk_version to java_import." 2021-04-01 19:45:53 +00:00
Lukács T. Berki
ae5bf80c7c Merge "Reorganize soong_build/main.go ." am: c5b3a1722c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1662203

Change-Id: I822eed4dbe069298e929114ef0f37b4c0ca459f6
2021-04-01 19:13:21 +00:00
Paul Duffin
cdc1757b07 Merge "Convert remaining rust tests to use test fixtures" am: e6165d0f46
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658074

Change-Id: Iee307b1ed305c2c253177303a83da5adef64e54f
2021-04-01 19:07:51 +00:00
Lukács T. Berki
c5b3a1722c Merge "Reorganize soong_build/main.go ." 2021-04-01 19:05:31 +00:00
Paul Duffin
e6165d0f46 Merge "Convert remaining rust tests to use test fixtures" 2021-04-01 18:13:23 +00:00
Lukacs T. Berki
6790ebcc59 Reorganize soong_build/main.go .
This makes it more easy to see what's happening under which modes. Modes
are:

- Regular builds
- Mixed mode builds
- bp2build
- soong_docs

Test: Presubmit + bootstrap_test.sh
Change-Id: I06e3fcb84986b919be1cd9eb456531259ede1183
2021-04-01 18:01:14 +02:00
Paul Duffin
64b3d2adbe Merge changes Idc01d3cc,I644db99c am: 379f36b6e5 am: 35bc45ceb4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660144

Change-Id: I742f7dc058be2068c0a87037a60c0492959417b5
2021-04-01 15:47:32 +00:00
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
Paul Duffin
35bc45ceb4 Merge changes Idc01d3cc,I644db99c am: 379f36b6e5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660144

Change-Id: I174a0e255bb43f98f2c23571e5f8a73549ab2278
2021-04-01 15:05:33 +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
Paul Duffin
379f36b6e5 Merge changes Idc01d3cc,I644db99c
* changes:
  Remove FixturePreparer.Extend()
  Remove FixtureFactory
2021-04-01 14:34:02 +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
79abe57f53 Remove FixturePreparer.Extend()
Use GroupFixturePreparers instead.

Bug: 182885307
Test: m nothing
Change-Id: Idc01d3cc5a57576a4cf417e9105d1ab851126e10
2021-04-01 10:33:20 +01:00
Paul Duffin
4814bb814a Remove FixtureFactory
Bug: 182885307
Test: m nothing
Change-Id: I644db99cc6905f544d3e7479b435be26dbf6c59b
2021-04-01 10:33:02 +01: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
Jaewoong Jung
6d15d63556 Add min_sdk_version to java_import.
Fixes: 183695497
Test: apex_test.go
Change-Id: Ie255f74d40432f4bdd0092d618705a7d17235e58
2021-03-31 16:50:42 -07:00