Commit graph

40081 commits

Author SHA1 Message Date
Paul Duffin
e06a34d148 Merge "Add bootclasspath_fragment as an alias for boot_image" am: 755b10fe53 am: 0c541b7c1d am: 3e56890e1d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655217

Change-Id: I8e7eea3b7e1b1b0a47e24c800ffce33f9943e107
2021-03-29 15:42:23 +00:00
Paul Duffin
3e56890e1d Merge "Add bootclasspath_fragment as an alias for boot_image" am: 755b10fe53 am: 0c541b7c1d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655217

Change-Id: Id99ca66bcec57e6fb4937479c789592609e45290
2021-03-29 14:56:24 +00:00
Paul Duffin
a84ef0bb15 Merge "Convert java/boot_image_test.go to test fixtures" am: 60fbea0ec6 am: 9b66f48c17 am: 682589237f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652450

Change-Id: I48adf5836d42af746a7790ecfe93dfb9db771702
2021-03-29 14:19:59 +00:00
Paul Duffin
f9bedde16f Merge "Change type of Image_name from string to *string" am: 63782aba78 am: fb2be116cc am: 04a10f160c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652449

Change-Id: Ie1c6adc7423d60309259d6555d2949c668dfc8a1
2021-03-29 14:19:53 +00:00
Paul Duffin
9139488505 Merge "Make apex/boot_image_test.go more realistic" am: 1b3d4923c1 am: 86ce9334bf am: a4749563a0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652448

Change-Id: I8e8c608d4e0215e41ce151271af00a0a58fcb7f5
2021-03-29 14:19:47 +00:00
Paul Duffin
0c541b7c1d Merge "Add bootclasspath_fragment as an alias for boot_image" am: 755b10fe53
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655217

Change-Id: Ice08a1fd0aeec6bc92770bc3377e139c527bce96
2021-03-29 14:14:58 +00:00
Paul Duffin
755b10fe53 Merge "Add bootclasspath_fragment as an alias for boot_image" 2021-03-29 13:37:18 +00:00
Paul Duffin
682589237f Merge "Convert java/boot_image_test.go to test fixtures" am: 60fbea0ec6 am: 9b66f48c17
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652450

Change-Id: I8d726e6dc502f7821834ac03facd7bcd7b70c381
2021-03-29 13:32:14 +00:00
Paul Duffin
04a10f160c Merge "Change type of Image_name from string to *string" am: 63782aba78 am: fb2be116cc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652449

Change-Id: Icc357e1d093767bcf87481cb3f0875f3467a0853
2021-03-29 13:32:09 +00:00
Paul Duffin
a4749563a0 Merge "Make apex/boot_image_test.go more realistic" am: 1b3d4923c1 am: 86ce9334bf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652448

Change-Id: I6f11e8d747c587cb95cbd4b90a10ab011c03e20d
2021-03-29 13:32:02 +00:00
Paul Duffin
9b66f48c17 Merge "Convert java/boot_image_test.go to test fixtures" am: 60fbea0ec6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652450

Change-Id: I08edc1e00ab3f34ac503a80a98ec684d4597ddb5
2021-03-29 12:58:37 +00:00
Paul Duffin
fb2be116cc Merge "Change type of Image_name from string to *string" am: 63782aba78
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652449

Change-Id: Ieb08efa10838f9dcbc4018da13bd4e41dcb615ad
2021-03-29 12:57:58 +00:00
Paul Duffin
86ce9334bf Merge "Make apex/boot_image_test.go more realistic" am: 1b3d4923c1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652448

Change-Id: I852e2a4a1e001b03af4d1ebd10ee7193145cb570
2021-03-29 12:57:08 +00:00
Paul Duffin
c0a4050c3f Merge "Convert linkerconfig package to use test fixtures" am: 30231da694 am: 0a4e265ca4 am: e68dccda0c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655210

Change-Id: Idee34be695a39e0d0f1251a3b24873a99b413b76
2021-03-29 12:39:24 +00:00
Paul Duffin
60fbea0ec6 Merge "Convert java/boot_image_test.go to test fixtures" 2021-03-29 12:17:57 +00:00
Paul Duffin
63782aba78 Merge "Change type of Image_name from string to *string" 2021-03-29 12:17:42 +00:00
Paul Duffin
1b3d4923c1 Merge "Make apex/boot_image_test.go more realistic" 2021-03-29 12:10:48 +00:00
Paul Duffin
e68dccda0c Merge "Convert linkerconfig package to use test fixtures" am: 30231da694 am: 0a4e265ca4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655210

Change-Id: I4aa84675c9233bdd3fdfe98f263b1ca3bede06f8
2021-03-29 11:50:08 +00:00
Paul Duffin
0a4e265ca4 Merge "Convert linkerconfig package to use test fixtures" am: 30231da694
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655210

Change-Id: If33ff27b9f118f336b5e34306a854705334106c5
2021-03-29 11:09:01 +00:00
Jingwen Chen
ec5182f045 Merge "Remove comment about gitignore for BUILD files." am: cb745601b9 am: 82a1a77228 am: 0d3d7e1fa4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655347

Change-Id: I139ee1f9a6da060a1091cf30ed33f93714ab1e2a
2021-03-29 10:53:00 +00:00
Ulyana Trafimovich
a62a11b135 Merge changes I1f0ab4af,Iea3be0fc am: a8f6db972f am: 07f2bbf4fc am: e7f2a6e2fb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652624

Change-Id: Iffcb195edf0ba3bd078ba439fbcaa38d7c0e7ba2
2021-03-29 10:52:54 +00:00
Paul Duffin
815e678497 Merge "Prune test preparers in apex/boot_image_test.go" am: 0839101430 am: 9d0d498922 am: 74d71d7848
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652447

Change-Id: Ie996b7282450f3b564f9a1eb2e1d501cb094e736
2021-03-29 10:52:47 +00:00
Paul Duffin
8692ee5aec Merge "Prevent apex from using preferred prebuilt_boot_image" am: fed8df3424 am: d1255ed19a am: 53a2dcc01c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1647168

Change-Id: I18db745fe57692c288ae83fed482852f6522803e
2021-03-29 10:52:40 +00:00
Paul Duffin
12e3c95308 Merge "Convert kernel package to use test fixtures" am: acde8e7fed am: 2711096f42 am: 6a2a7888bd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655211

Change-Id: Id9369a1ff68ef30303107f0813978f60ff861bec
2021-03-29 10:52:31 +00:00
Paul Duffin
30231da694 Merge "Convert linkerconfig package to use test fixtures" 2021-03-29 10:34:46 +00:00
Jingwen Chen
0d3d7e1fa4 Merge "Remove comment about gitignore for BUILD files." am: cb745601b9 am: 82a1a77228
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655347

Change-Id: Idc42c459e087537ffad10d922cf154596ce46cf4
2021-03-29 10:30:17 +00:00
Paul Duffin
4b64ba05b6 Add bootclasspath_fragment as an alias for boot_image
This is part of the work to rename boot_image to bootclasspath_fragment
which is being done for two reasons:
1. To avoid clashing with the bootimg module type.
2. To better reflect what this represents.

While a bootclasspath_fragment can create what ART calls a boot image
(which is different to what the bootimg module type represents) it does
not have to do so.

Bug: 177892522
Test: m nothing
Change-Id: Ib45604be7adc790ded9e27a2ac812dd7522ca8db
2021-03-29 11:05:55 +01:00
Paul Duffin
837486d308 Convert java/boot_image_test.go to test fixtures
Bug: 177892522
Test: m nothing
Change-Id: I91d2bd2eabe5916fd158501bd0d4fdb608919019
2021-03-29 11:05:55 +01:00
Paul Duffin
64be7bb32f Change type of Image_name from string to *string
Bug: 177892522
Test: m nothing
Change-Id: Id72b6079f11c28df6248e71998fb97851cfc5be9
2021-03-29 11:05:55 +01:00
Paul Duffin
9ea71c0f4f Make apex/boot_image_test.go more realistic
Previously it was unrealistic because the "boot" image cannot be added
to an apex (because it references modules from multiple different
apexes). Only the "art" image can be added to an apex. So, this change
switches to use the "art" image which requires the apex name is changed
to "com.android.art".

This change also adds an equivalent test for prebuilt_boot_image as
well as a check of the module dependencies for the mybootimage module.

Bug: 177892522
Test: m nothing
Change-Id: I20089b02c80bedc072dbb950dce09bc4e8397f3a
2021-03-29 11:05:55 +01:00
Ulyana Trafimovich
e7f2a6e2fb Merge changes I1f0ab4af,Iea3be0fc am: a8f6db972f am: 07f2bbf4fc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652624

Change-Id: Icf5bcf8c03927aa4ee9cbd2788a313294712d9b7
2021-03-29 10:03:28 +00:00
Paul Duffin
74d71d7848 Merge "Prune test preparers in apex/boot_image_test.go" am: 0839101430 am: 9d0d498922
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652447

Change-Id: I6ff973379f4b5205374ef2b22df9d6270d5132f1
2021-03-29 10:03:23 +00:00
Paul Duffin
53a2dcc01c Merge "Prevent apex from using preferred prebuilt_boot_image" am: fed8df3424 am: d1255ed19a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1647168

Change-Id: Icd74a3c3d00cde81c3ff4c2491847330d6301d00
2021-03-29 10:03:17 +00:00
Paul Duffin
6a2a7888bd Merge "Convert kernel package to use test fixtures" am: acde8e7fed am: 2711096f42
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655211

Change-Id: Ib69130be6ec92b451826c79689c49145d05ed593
2021-03-29 10:03:10 +00:00
Jingwen Chen
82a1a77228 Merge "Remove comment about gitignore for BUILD files." am: cb745601b9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655347

Change-Id: I7d01c3610b529edc484e2b3fe8ef5cfecc87e08d
2021-03-29 10:03:03 +00:00
Jingwen Chen
cb745601b9 Merge "Remove comment about gitignore for BUILD files." 2021-03-29 09:49:02 +00:00
Ulyana Trafimovich
07f2bbf4fc Merge changes I1f0ab4af,Iea3be0fc am: a8f6db972f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652624

Change-Id: Id1f5e16e187d9c0832e102c69724952bea21631c
2021-03-29 09:42:28 +00:00
Thiébaud Weksteen
fb4a6123a4 Merge "rust: Add features list to rust_project.json" am: 785f378f7d am: 563dc58add am: 9d747dc01e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652621

Change-Id: I19db37e290a238f7f533208724cbf9c05a07228f
2021-03-29 09:26:28 +00:00
Ulyana Trafimovich
a8f6db972f Merge changes I1f0ab4af,Iea3be0fc
* changes:
  Fix AAPT path in dexpreopt.
  Allow modules that don't run verify_uses_libraries to have nonempty CLC.
2021-03-29 09:24:00 +00:00
Paul Duffin
9d0d498922 Merge "Prune test preparers in apex/boot_image_test.go" am: 0839101430
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652447

Change-Id: I3c6bb2acf19a6e9d205e7197a4f957ae4e16f3ac
2021-03-29 09:23:01 +00:00
Paul Duffin
d1255ed19a Merge "Prevent apex from using preferred prebuilt_boot_image" am: fed8df3424
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1647168

Change-Id: Ib446211d4d98a294a16335fa719230875917d9c7
2021-03-29 09:22:24 +00:00
Paul Duffin
2711096f42 Merge "Convert kernel package to use test fixtures" am: acde8e7fed
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655211

Change-Id: I5d4f2a3380b0b2e2a59c6ffdc4fb24007f3086a6
2021-03-29 09:21:41 +00:00
Thiébaud Weksteen
9d747dc01e Merge "rust: Add features list to rust_project.json" am: 785f378f7d am: 563dc58add
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652621

Change-Id: I6f70f73395549e6a80c84a9bebf48cc2fc38262f
2021-03-29 08:59:34 +00:00
Paul Duffin
0839101430 Merge "Prune test preparers in apex/boot_image_test.go" 2021-03-29 08:51:03 +00:00
Paul Duffin
fed8df3424 Merge "Prevent apex from using preferred prebuilt_boot_image" 2021-03-29 08:50:37 +00:00
Paul Duffin
acde8e7fed Merge "Convert kernel package to use test fixtures" 2021-03-29 08:50:05 +00:00
Thiébaud Weksteen
563dc58add Merge "rust: Add features list to rust_project.json" am: 785f378f7d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652621

Change-Id: I1dd10300aef83f96e43afb27c4cfff47e59195e3
2021-03-29 08:40:25 +00:00
Jingwen Chen
2288f3155b Remove comment about gitignore for BUILD files.
Change-Id: Ic1c795d9d961b309d269b1bc4bccb7522f288e9b
Rationale: we haven't modified any gitignore file. lberki has a new proposal to steer this in a new direction, so let's reflect the comment to the current reality.
2021-03-29 08:31:28 +00:00
Thiébaud Weksteen
785f378f7d Merge "rust: Add features list to rust_project.json" 2021-03-29 07:58:08 +00:00
Paul Duffin
e5ac250ab4 Convert kernel package to use test fixtures
Bug: 181070625
Test: m nothing
Change-Id: Ibd3cc62feec1b911d74451d53cea81607d3bec36
2021-03-29 01:25:26 +01:00