Paul Duffin
214dcbbc77
Merge "Ensure java_system_modules_import uses prebuilts" am: fc9c218e83
am: 5b58ea07dd
am: 999d00098d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1627999
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5cb81d9cc34b6cd4e73f49d54cf4f4a86f871ea5
2021-03-11 17:38:15 +00:00
Paul Duffin
1d4b35b6c8
Merge "Improve system modules tests" am: a2fcd19aef
am: 5afefecf0e
am: a2b0fc68e8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628002
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I173dcc684b9601b286d063181789abb003a91f89
2021-03-11 17:37:28 +00:00
Paul Duffin
999d00098d
Merge "Ensure java_system_modules_import uses prebuilts" am: fc9c218e83
am: 5b58ea07dd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1627999
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4645b4ed61b55c80efaf272ef9af5fd1e8339160
2021-03-11 16:57:02 +00:00
Paul Duffin
a2b0fc68e8
Merge "Improve system modules tests" am: a2fcd19aef
am: 5afefecf0e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628002
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3d6a6cb9697c408a1dcb2b71b20b766141624020
2021-03-11 16:56:48 +00:00
Artur Satayev
182c96ccb5
Merge "Introduce derive_classpath service." into sc-dev
2021-03-11 16:25:20 +00:00
Paul Duffin
5b58ea07dd
Merge "Ensure java_system_modules_import uses prebuilts" am: fc9c218e83
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1627999
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0add314d0582d2bdf9079a1c3e992f8fe0ad8127
2021-03-11 16:17:54 +00:00
Paul Duffin
5afefecf0e
Merge "Improve system modules tests" am: a2fcd19aef
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628002
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie69ddc34efca822bd9a7cd49cad93d6b0831242a
2021-03-11 16:17:21 +00:00
Paul Duffin
fc9c218e83
Merge "Ensure java_system_modules_import uses prebuilts"
2021-03-11 15:50:58 +00:00
Paul Duffin
a2fcd19aef
Merge "Improve system modules tests"
2021-03-11 15:50:34 +00:00
Christopher Parsons
3a642e2800
Merge "mixed builds for cc_static_library without deps" am: 2bed9ffaf4
am: a86985e40a
am: 3cb7e6bd83
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625068
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iddbc0f04dec0faeb70f5ccfe694dd3deaa65cb61
2021-03-11 15:46:38 +00:00
Paul Duffin
f270882173
Merge "Convert system modules tests to use fixtures" am: 6f688d03c8
am: df0b483089
am: fea2bed0f8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628001
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I11eb84903c7394cbc5b5e774e1c64bd3f355e80c
2021-03-11 15:46:30 +00:00
Paul Duffin
d4831e4d8a
Merge "Separate system modules tests into their own file" am: 8075291a94
am: 7c05abc397
am: 044abfd9a1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628000
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I802acaf6b80b1190750abbdd96c0d161ae3a4e07
2021-03-11 15:46:22 +00:00
Paul Duffin
3a7399b7d2
Merge "prebuilt_apis should create a java_system_modules_import" am: f18ff339a9
am: 08e8a82ebb
am: 2543e840af
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626518
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I20b4649e39812b1e53bafe3ba13179823afb5dfc
2021-03-11 15:46:14 +00:00
Jaewoong Jung
8faade67a4
Merge "Populate baseline_file values." am: 48b8df14be
am: 4bc4800ce7
am: 41dea7a344
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1624707
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7ca117224b92585601b2a542f98ee2a776c4895c
2021-03-11 15:46:02 +00:00
Paul Duffin
a998e9806a
Merge "Add preparer for test with variables" am: 8c004c6c04
am: c371cbb33d
am: cc285a8253
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626512
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I46946e1448cf6e83399e46c259e8fba9e6744817
2021-03-11 15:45:20 +00:00
Paul Duffin
3e72530cea
Merge "Add AssertStringListContains to TestHelper" am: 01c76ca278
am: f2def2fc4e
am: 8bbbff16d9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626510
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7cee161a60b865370a60b0ab2a6f9a431b9d8497
2021-03-11 15:45:13 +00:00
Paul Duffin
73bfe21a62
Merge "Convert fuchsia tests to use test fixtures" am: 4e1916011c
am: 3dbfef078e
am: 9225cc2bf9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626509
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic1b047130460625a91c636c8e2aa516bcbbf35f3
2021-03-11 15:45:03 +00:00
Christopher Parsons
3cb7e6bd83
Merge "mixed builds for cc_static_library without deps" am: 2bed9ffaf4
am: a86985e40a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625068
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I37ccb81a8a558a37119a3bebc302327c39781729
2021-03-11 15:41:47 +00:00
Paul Duffin
fea2bed0f8
Merge "Convert system modules tests to use fixtures" am: 6f688d03c8
am: df0b483089
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628001
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib4aebc9e5b74c373a6072286a454ed721e53be7f
2021-03-11 15:41:41 +00:00
Paul Duffin
044abfd9a1
Merge "Separate system modules tests into their own file" am: 8075291a94
am: 7c05abc397
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628000
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0a4bff6fc543c1c378a834fb9a615c6689216859
2021-03-11 15:41:32 +00:00
Paul Duffin
2543e840af
Merge "prebuilt_apis should create a java_system_modules_import" am: f18ff339a9
am: 08e8a82ebb
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626518
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5228bb68a51f01cf94019f04ad89178220bb9095
2021-03-11 15:41:27 +00:00
Jaewoong Jung
41dea7a344
Merge "Populate baseline_file values." am: 48b8df14be
am: 4bc4800ce7
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1624707
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I00cc4e320a9013689b7ef5e0f253379df8935d1b
2021-03-11 15:41:14 +00:00
Christopher Parsons
a86985e40a
Merge "mixed builds for cc_static_library without deps" am: 2bed9ffaf4
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625068
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifb10ef59263b84badad178de1b34b0acc06cc19d
2021-03-11 15:21:50 +00:00
Paul Duffin
df0b483089
Merge "Convert system modules tests to use fixtures" am: 6f688d03c8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628001
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I72ab39aa93ad79fd53f97ca3b3eb08ea327451e8
2021-03-11 15:21:42 +00:00
Paul Duffin
7c05abc397
Merge "Separate system modules tests into their own file" am: 8075291a94
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628000
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I629d3459f4c2467233baadd891d6e11630900208
2021-03-11 15:21:32 +00:00
Paul Duffin
08e8a82ebb
Merge "prebuilt_apis should create a java_system_modules_import" am: f18ff339a9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626518
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I920b5d2496f956ac41ba6a631c848445d7c36ffb
2021-03-11 15:21:18 +00:00
Jaewoong Jung
4bc4800ce7
Merge "Populate baseline_file values." am: 48b8df14be
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1624707
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia3586bc9e7bc9f8e31ec98c3fb021f3ad1f7d7cc
2021-03-11 15:20:56 +00:00
Paul Duffin
cc285a8253
Merge "Add preparer for test with variables" am: 8c004c6c04
am: c371cbb33d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626512
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7d959c9b1c80ccc8ba367fe27ca1a4734fd6d7eb
2021-03-11 15:20:39 +00:00
Paul Duffin
8bbbff16d9
Merge "Add AssertStringListContains to TestHelper" am: 01c76ca278
am: f2def2fc4e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626510
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8e655f2059f13468aaf821addac0d45edd409491
2021-03-11 15:20:33 +00:00
Paul Duffin
9225cc2bf9
Merge "Convert fuchsia tests to use test fixtures" am: 4e1916011c
am: 3dbfef078e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626509
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I595f9751658d369f20b1b17003442ae1b47a18ac
2021-03-11 15:20:26 +00:00
Christopher Parsons
2bed9ffaf4
Merge "mixed builds for cc_static_library without deps"
2021-03-11 15:11:44 +00:00
Paul Duffin
6f688d03c8
Merge "Convert system modules tests to use fixtures"
2021-03-11 15:11:20 +00:00
Paul Duffin
8075291a94
Merge "Separate system modules tests into their own file"
2021-03-11 15:10:54 +00:00
Paul Duffin
f18ff339a9
Merge "prebuilt_apis should create a java_system_modules_import"
2021-03-11 15:09:47 +00:00
Jaewoong Jung
48b8df14be
Merge "Populate baseline_file values."
2021-03-11 15:04:52 +00:00
Paul Duffin
c371cbb33d
Merge "Add preparer for test with variables" am: 8c004c6c04
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626512
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I25e2d4b3d00f1a97e80197231a92792342eb49f9
2021-03-11 14:40:40 +00:00
Paul Duffin
f2def2fc4e
Merge "Add AssertStringListContains to TestHelper" am: 01c76ca278
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626510
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If44fcbc388abab527cb7b9fa3f2507fc6d292de7
2021-03-11 14:40:30 +00:00
Paul Duffin
3dbfef078e
Merge "Convert fuchsia tests to use test fixtures" am: 4e1916011c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626509
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie6395327af14e39d05ef04839f49a600d5a63e15
2021-03-11 14:39:41 +00:00
Paul Duffin
8c004c6c04
Merge "Add preparer for test with variables"
2021-03-11 14:35:57 +00:00
Paul Duffin
e7a055c6a3
Add preparer for test with variables
...
Bug: 181070625
Test: m nothing
Change-Id: I101826d88e67c63a58007f20f8e24d574dd7c99b
2021-03-11 14:16:49 +00:00
Paul Duffin
01c76ca278
Merge "Add AssertStringListContains to TestHelper"
2021-03-11 14:08:01 +00:00
Paul Duffin
4e1916011c
Merge "Convert fuchsia tests to use test fixtures"
2021-03-11 14:07:01 +00:00
Anton Hansson
a1a971bf37
[automerger skipped] Merge changes I2a02dc38,I40e8d4c0,Id3952e13 into mainline-prod am: 152868a736
-s ours
...
am skip reason: Change-Id I2a02dc382fcbb142d8e4fbdbb6ca461986627d25 with SHA-1 e0070ee313
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13828116
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8d4099238903bab7f03be2bf33d50f7d82b9f3bd
2021-03-11 13:16:13 +00:00
Lukacs T. Berki
778c31d32f
Hard-wire the path to xcrun as /usr/bin/xcrun. am: 21d5c7aaa9
am: 8f23c72f9e
am: 177e95d4d6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626516
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I980be00ea77f4423ff04f4c44b03391aef94d735
2021-03-11 12:38:50 +00:00
Anton Hansson
152868a736
Merge changes I2a02dc38,I40e8d4c0,Id3952e13 into mainline-prod
...
* changes:
Implement OutputFiles for python modules.
Support python binaries in sh_test_host
Add data bin and lib properties to sh_test
2021-03-11 12:30:00 +00:00
Lukacs T. Berki
177e95d4d6
Hard-wire the path to xcrun as /usr/bin/xcrun. am: 21d5c7aaa9
am: 8f23c72f9e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626516
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I438f4b45ca2e5665ce4b234bafec763893356ce4
2021-03-11 11:57:06 +00:00
Artur Satayev
ff36f17b40
Introduce derive_classpath service.
...
go/updatable-classpath
Bug: 180105615
Test: manual + boot test
Change-Id: I713b3b881e2214f2994e1830580ae1122d7c5c3d
2021-03-11 11:46:28 +00:00
Liz Kammer
2ebaa881d3
Implement OutputFiles for python modules.
...
This enables python binaries to be included in data properties with the
format ":module".
Test: m FirmwareDtboVerification with local changes
Bug: 153848038
Merged-In: I2a02dc382fcbb142d8e4fbdbb6ca461986627d25
Change-Id: I2a02dc382fcbb142d8e4fbdbb6ca461986627d25
(cherry picked from commit e0070ee313
)
2021-03-11 11:03:52 +00:00
Lukacs T. Berki
8f23c72f9e
Hard-wire the path to xcrun as /usr/bin/xcrun. am: 21d5c7aaa9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626516
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia4d3cedc38f0d29e5cc7dbe135525b5922f63129
2021-03-11 10:59:32 +00:00
Anton Hansson
023707d317
Support python binaries in sh_test_host
...
Make the code for data_bins/data_device_binds module-type agnostic.
Bug: 176581143
Test: m gen_sdk_test
Merged-In: I40e8d4c06f583cae523d97ce63822960872907db
Change-Id: I40e8d4c06f583cae523d97ce63822960872907db
(cherry picked from commit 2f6422cb1e
)
2021-03-11 10:17:30 +00:00