Paul Duffin
23090f4156
Merge "Add prebuilt_boot_image and add boot_images to sdk" am: 32a8aadfaa
am: 7b1c7dc98f
am: 2b2582abf0
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626501
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic812c1303d09f536a4e23607c13b99a2487951d2
2021-03-12 09:44:28 +00:00
Paul Duffin
24963ea1e3
Merge "Prevent mock filesystem files being overridden by accident" am: 412a209d87
am: a517bddd85
am: 53b805d276
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629639
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If124e77a419bc9d1b9416187263a88aefb28874c
2021-03-12 09:44:20 +00:00
Paul Duffin
d03f6a868f
Merge changes Ifc96992e,Ic76523ba am: c10ee77ea6
am: b1ef3e2ce9
am: b587704556
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628691
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I15bfdaef65a848ec6ed0210c883195409ce85814
2021-03-12 09:44:13 +00:00
Paul Duffin
a987df1281
Merge "Improve name of getModuleHeaderJarsAsNormalizedPaths" am: c7cdd1513c
am: 83eb3ba314
am: 14cb8dd965
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628682
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I08356e305400519865ba41fb34da5057906ff81b
2021-03-12 09:44:03 +00:00
Jooyung Han
a200f6a134
Merge "Fix bootimg.cmdline to use ShellEscapeIncludingSpaces" am: d0b3574072
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620649
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic71f37154a75b796b9856c50d2dff6ee736466ed
2021-03-12 09:19:55 +00:00
Jooyung Han
d0b3574072
Merge "Fix bootimg.cmdline to use ShellEscapeIncludingSpaces"
2021-03-12 09:10:22 +00:00
Paul Duffin
643c5def75
Fix build failure in boot_image_sdk_test.go am: ebddef39dd
am: 83bf57a459
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629621
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9b406c29742c44bbf7cf26ba689bbaf939c24a12
2021-03-12 09:03:35 +00:00
Paul Duffin
2b2582abf0
Merge "Add prebuilt_boot_image and add boot_images to sdk" am: 32a8aadfaa
am: 7b1c7dc98f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626501
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0ee0f2947181bb5c28bf543246e8c713aa0beae5
2021-03-12 09:02:51 +00:00
Paul Duffin
53b805d276
Merge "Prevent mock filesystem files being overridden by accident" am: 412a209d87
am: a517bddd85
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629639
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifbd40ef893086f613239e657a8130224e8fd33db
2021-03-12 09:02:44 +00:00
Paul Duffin
b587704556
Merge changes Ifc96992e,Ic76523ba am: c10ee77ea6
am: b1ef3e2ce9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628691
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7f98cabe5a6ddae90458f7dc8a8b1725095493f4
2021-03-12 09:02:39 +00:00
Paul Duffin
14cb8dd965
Merge "Improve name of getModuleHeaderJarsAsNormalizedPaths" am: c7cdd1513c
am: 83eb3ba314
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628682
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I68b75a9b92cf966ddfc1cfdfff746259164d74b4
2021-03-12 09:02:32 +00:00
Paul Duffin
451aeef583
Convert testDexpreoptBoot to use test fixtures
...
Bug: 181070625
Test: m nothing
Change-Id: Iaca15c87c68383630aed015e0e17adad3c37c4b1
2021-03-12 09:02:13 +00:00
Daulet Zhanguzin
0edfd5fb57
[automerger skipped] Reinstate the enforcement of stable core platform API usage am: b528ed5fae
-s ours
...
am skip reason: Change-Id Ieddaf859f568bc8ee486692474a4dec48b3d25e6 with SHA-1 eaadd67a99
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13838694
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0ab80274e13b8610491a81cd4d116eb149ec93b2
2021-03-12 08:47:32 +00:00
Paul Duffin
83bf57a459
Fix build failure in boot_image_sdk_test.go am: ebddef39dd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629621
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifac4e4d66bac1a04c1cbfca72ed4d4078db663d9
2021-03-12 08:43:08 +00:00
Paul Duffin
7b1c7dc98f
Merge "Add prebuilt_boot_image and add boot_images to sdk" am: 32a8aadfaa
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626501
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I079826943a95173a362ac003bb8a03c853877767
2021-03-12 08:25:30 +00:00
Paul Duffin
a517bddd85
Merge "Prevent mock filesystem files being overridden by accident" am: 412a209d87
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629639
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6f27928b7142c141c91ebd6b6a2b2fa3ea27c572
2021-03-12 08:25:19 +00:00
Paul Duffin
b1ef3e2ce9
Merge changes Ifc96992e,Ic76523ba am: c10ee77ea6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628691
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I62a6d450597de5d28f09c58cc30475774ec8a795
2021-03-12 08:25:11 +00:00
Paul Duffin
83eb3ba314
Merge "Improve name of getModuleHeaderJarsAsNormalizedPaths" am: c7cdd1513c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628682
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I10858332c12a0455be46c15893e353f82ea02f66
2021-03-12 08:24:33 +00:00
Paul Duffin
ebddef39dd
Fix build failure in boot_image_sdk_test.go
...
Test: m nothing
Change-Id: I1f386fe4119ac9c3efc8d046142d02862af5fd99
2021-03-12 08:20:27 +00:00
Paul Duffin
32a8aadfaa
Merge "Add prebuilt_boot_image and add boot_images to sdk"
2021-03-12 08:06:45 +00:00
Paul Duffin
412a209d87
Merge "Prevent mock filesystem files being overridden by accident"
2021-03-12 08:04:43 +00:00
Paul Duffin
c10ee77ea6
Merge changes Ifc96992e,Ic76523ba
...
* changes:
Support test fixtures in sdk package
Add apexFixtureFactory to apex package
2021-03-12 08:01:31 +00:00
Paul Duffin
c7cdd1513c
Merge "Improve name of getModuleHeaderJarsAsNormalizedPaths"
2021-03-12 07:59:39 +00:00
Jooyung Han
32cddd0ba5
Fix bootimg.cmdline to use ShellEscapeIncludingSpaces
...
bootimg.cmdline should be passed to mkbootimg's --cmdline flag as a
single argument. Because cmdline can have spaces we should escape it
with ShellEscapeIncludingSpaces rather than blindly putting double
qoutes with ShellEscape, which also puts single quotes when necessary.
Bug: 182092664
Test: m nothing && see build.ninja (microdroid's build commands)
Test: boot microdroid on VIM3L
Change-Id: I5d766bb0a816d829569c9ebfddf97c4f846f78f8
2021-03-12 14:38:46 +09:00
Jiyong Park
4a538e7d16
Merge "bootimg and logical_partition are OutputFileProducer" am: cb60b31f21
am: 036c1a503d
am: 0f98aa62ca
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620998
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idbffb984a0cba8ddcebbbf35a9dccffee6a87485
2021-03-12 05:37:01 +00:00
Daulet Zhanguzin
b528ed5fae
Reinstate the enforcement of stable core platform API usage
...
It appears as though change I3a39be5f0b8736de4822c6a14072c78d4e4ad89d
accidentally stopped enforcing the use of the stable core platform
API in AOSP when the changes from rvc-dev-plus-aosp-without-vendor were
merged in.
Unfortunately, since then some additional usages of legacy core
platform APIs have crept in so this adds the affected modules to the
list of modules allowed to use the legacy core platform APIs.
Bug: 180399951
Test: m checkbuild
Merged-In: Ieddaf859f568bc8ee486692474a4dec48b3d25e6
Change-Id: Iacbee67fa103279a9823bd26c559821b04849be6
(cherry picked from commit 6fb6cffce2
)
2021-03-12 05:06:48 +00:00
Jiyong Park
0f98aa62ca
Merge "bootimg and logical_partition are OutputFileProducer" am: cb60b31f21
am: 036c1a503d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620998
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7dc3a47cee43aeba98ae2d073e484c44c782e751
2021-03-12 04:34:03 +00:00
Jiyong Park
036c1a503d
Merge "bootimg and logical_partition are OutputFileProducer" am: cb60b31f21
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620998
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I92f21f8838ca92f2974226b54ab3df63c9d8c606
2021-03-12 03:55:07 +00:00
Julien Desprez
3f4e7a10a6
Remove the robolectric heuristic out of java_test
...
Test: presubmit
Bug: 180736967
Change-Id: I65193d1639088149d8c2f1d5b7d4311e9f69a609
2021-03-12 03:41:21 +00:00
Treehugger Robot
7d006a3d19
Merge changes I0ad54aa7,I1d6d20ec am: d13e31a8cc
am: bb80dcb022
am: 76084edf9b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1627540
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I15a228eaab09245c8493f3931ca6ef6d45059a0e
2021-03-12 03:15:37 +00:00
Jiyong Park
cb60b31f21
Merge "bootimg and logical_partition are OutputFileProducer"
2021-03-12 03:00:19 +00:00
Treehugger Robot
76084edf9b
Merge changes I0ad54aa7,I1d6d20ec am: d13e31a8cc
am: bb80dcb022
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1627540
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I85d88f246d77e2a125444e84d309aae16dc9acfd
2021-03-12 02:29:40 +00:00
Treehugger Robot
bb80dcb022
Merge changes I0ad54aa7,I1d6d20ec am: d13e31a8cc
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1627540
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If96954bed5dcb00a45922924182f588bedfaec31
2021-03-12 01:39:00 +00:00
Treehugger Robot
d13e31a8cc
Merge changes I0ad54aa7,I1d6d20ec
...
* changes:
Propagate LANG environment variable to lint in RBE
Default lint RBE to local exec strategy
2021-03-12 01:11:49 +00:00
Sophie Zheng
483908b3cb
[automerger skipped] Merge "Fix getting list of module libraries in builder.go" into mainline-prod am: 663778c712
-s ours
...
am skip reason: Change-Id Ie1799c0972d63da823ad375f008018de782529d1 with SHA-1 c0ec6f99d7
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13819702
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idb53f1ac30bdbb91c7f0ba01c9c4167aa48b11e4
2021-03-12 00:28:45 +00:00
Paul Duffin
f2d55024bb
Merge "Convert cc/prebuilt_test.go to use fixtures" am: f11bced30b
am: e70de62af3
am: 8c0ee2d8ce
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626515
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib741c9ce6a2b10021960fa25dee42ae24d0069cb
2021-03-12 00:09:21 +00:00
Paul Duffin
efa480f650
Merge changes I6b408d44,I7e57c978 am: d7bbeffe0e
am: 7ac41ea830
am: e447d4d0ee
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626514
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibee3298948c2c842788442c53ba7125ecd61c54f
2021-03-12 00:09:15 +00:00
Paul Duffin
2ab218e6d0
Merge "Add text fixture preparers for rust package" am: b6a5064630
am: 3ad9f88b87
am: 04ae7d100d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628690
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If9a9a1e2164ea36ce4f07b8c73e1db346ad39529
2021-03-12 00:09:07 +00:00
Paul Duffin
5f4e479a28
Add missing // to clarify comment am: fe9a9e3f7d
am: 3106a3a986
am: 4ab6f0801b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628692
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia121e74d3e06ae9d3f99e3c2b5705b9536b6a803
2021-03-12 00:08:38 +00:00
Sophie Zheng
663778c712
Merge "Fix getting list of module libraries in builder.go" into mainline-prod
2021-03-11 23:38:08 +00:00
Paul Duffin
8c0ee2d8ce
Merge "Convert cc/prebuilt_test.go to use fixtures" am: f11bced30b
am: e70de62af3
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626515
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib0c7de32176b62063c28ac56e34e0ade4dd84e77
2021-03-11 23:15:17 +00:00
Paul Duffin
e447d4d0ee
Merge changes I6b408d44,I7e57c978 am: d7bbeffe0e
am: 7ac41ea830
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626514
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I92ab5dc23b6e39e298178bb5c01aa031be33de8d
2021-03-11 23:15:07 +00:00
Paul Duffin
04ae7d100d
Merge "Add text fixture preparers for rust package" am: b6a5064630
am: 3ad9f88b87
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628690
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id0659f7abe07bbc93e48145243374954d224f6e1
2021-03-11 23:14:59 +00:00
Paul Duffin
4ab6f0801b
Add missing // to clarify comment am: fe9a9e3f7d
am: 3106a3a986
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628692
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1a460c124718535e59c403eca936a717dddf550e
2021-03-11 23:14:48 +00:00
Paul Duffin
e70de62af3
Merge "Convert cc/prebuilt_test.go to use fixtures" am: f11bced30b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626515
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4b95790932130a6f1e6e6b84c916fd40ccaefdb5
2021-03-11 22:37:40 +00:00
Paul Duffin
7ac41ea830
Merge changes I6b408d44,I7e57c978 am: d7bbeffe0e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626514
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie4e73f474f9d547e22aac4b1b7926e1050ab92e6
2021-03-11 22:37:30 +00:00
Paul Duffin
3ad9f88b87
Merge "Add text fixture preparers for rust package" am: b6a5064630
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628690
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I60ab9f8e2a6a9cb32de2da0d137de5d80e1b388d
2021-03-11 22:37:20 +00:00
Paul Duffin
3106a3a986
Add missing // to clarify comment am: fe9a9e3f7d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628692
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I52278e26ba0f343f1b573cd60deebb0dbd049aa5
2021-03-11 22:36:39 +00:00
Paul Duffin
f11bced30b
Merge "Convert cc/prebuilt_test.go to use fixtures"
2021-03-11 21:58:39 +00:00
Paul Duffin
d7bbeffe0e
Merge changes I6b408d44,I7e57c978
...
* changes:
Add preparer for test to use AndroidMk
Convert cc/cc_test.go tests that use CreateTestContext to fixtures
2021-03-11 21:58:14 +00:00