Commit Graph

40521 Commits

Author SHA1 Message Date
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
Jingwen Chen 6c309cd0ac bp2build: don't generate a WORKSPACE.
bp2build doesn't need to generate a WORKSPACE file.

Also cleanup conversion_test.go.

Test: TH
Change-Id: Iba2f4b2f71d72ccf8b148cd11d78c190f93560c4
2021-04-01 11:50:27 +00:00
Anton Hansson 5d8652fcaf Set min_sdk_version for java imports in pom2bp
Previously min_sdk_version was only set for *_library build rules, and
not for *_import targets. This made min_sdk_version default to
sdk_version, which is usually "current", which is not correct for these
libraries.

Test: pom2bp -default-min_sdk_version 24 for androidx
Change-Id: I3b029315abeb559e66efad847ae664efb79f4509
2021-04-01 11:49:35 +00:00
Paul Duffin 27b254ba08 Merge "Remove apexFixtureFactory" am: abc89cf86b am: 4ec4ca02bd am: 8f1c917639
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660142

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

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

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

Change-Id: I05f25f377c8441e116bd026691795d617a6950f2
2021-04-01 11:35:47 +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
Yi Kong 4ad44e713b Move toc.sh to use LLVM binutils
Test: build
Change-Id: Ib965b6ea3fba6ae007135ac7e167cc50f0f6e3de
2021-04-01 17:45:42 +08: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 c5bc333cf5 Merge "Allow dependencies from platform variants to APEX modules." am: f8c9713fb8 am: 3311c129d4 am: 2e9cf54e07
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1654679

Change-Id: I5a00f0bdcd9cb53e6e8c1f0b7bf21eab7fab3dbf
2021-04-01 09:05:44 +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
Treehugger Robot 7349652925 Merge ""current" is implicitly added to stubs.versions" am: 25c47a43a5 am: 4ce23de995 am: cab9b4b25c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1641782

Change-Id: Ibc0b6e3fdd98b59900f9998f5c11c417d5d4a20a
2021-04-01 06:57:10 +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
Yi Kong 44208d77df Merge "Move gen_sorted_bss_symbols.sh to use LLVM binutils" am: 9d9e053964 am: dd19e029a5 am: 3ef89b207a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1659997

Change-Id: Ia30bce0b8866cbc5078f2c7fb8b4b8a8c930077f
2021-04-01 05:34:55 +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
Inseob Kim a46b51cf20 Support super image size automatic calculation
If the size is set to "auto", the size will be automatically calculated
by lpmake.

Bug: 181107248
Test: boot microdroid
Change-Id: I9dd599ca64e4d442bfb83fe45b1f03080a74f1e1
2021-04-01 13:19:30 +09: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 24fe75fa85 Merge "Fix multiple copies of read-only files in sbox" am: 85920c9389 am: 2d4d403560 am: 0295902294
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660771

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

Change-Id: I14109cbccc672868c0520a8c75477205e08fa805
2021-04-01 02:40:12 +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