Lukács T. Berki
ee4a95f1b5
Merge "Print a correct error message when a non-hermetic tool is not found." am: a55aefd57b
am: d922efecce
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625979
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I97c5791a09f2c456d02109eea4fd944ae7d3fc76
2021-03-11 08:26:10 +00:00
Lukács T. Berki
6a4cb09496
Merge "Fix the environment of soong_build:" am: 2373e597ea
am: 6222fd77f5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625980
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0ebddb4af48b5658737403624c5a9ce1483d218c
2021-03-11 08:25:54 +00:00
Lukács T. Berki
d922efecce
Merge "Print a correct error message when a non-hermetic tool is not found." am: a55aefd57b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625979
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I299a2ded24a68fb99a95da2341bd8a9ae7f587ea
2021-03-11 07:51:56 +00:00
Lukács T. Berki
6222fd77f5
Merge "Fix the environment of soong_build:" am: 2373e597ea
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625980
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I89423cbfbd352d3fd88949bd84f27ec98798bd95
2021-03-11 07:50:54 +00:00
Lukács T. Berki
a55aefd57b
Merge "Print a correct error message when a non-hermetic tool is not found."
2021-03-11 07:10:08 +00:00
Lukács T. Berki
2373e597ea
Merge "Fix the environment of soong_build:"
2021-03-11 07:09:24 +00:00
Treehugger Robot
0a74edc095
Merge "AIDEGen: Add "-fprofile-sample-use" parameter into category." am: b3d6edd6c0
am: d32045e2f3
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620690
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I90d57a16ea4cf3f20b0f20c345bc47242397eb71
2021-03-11 05:52:10 +00:00
Jingwen Chen
84e4f6975d
Merge "bp2build: add python_binary_host converter." am: 6aeb2911d8
am: 878997f3aa
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622686
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic893cac2e75edc1323ca92aa3b9c88e07f1b2581
2021-03-11 05:51:54 +00:00
Treehugger Robot
d32045e2f3
Merge "AIDEGen: Add "-fprofile-sample-use" parameter into category." am: b3d6edd6c0
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620690
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6e62eaa9bed684d767e36d1388b68cb1df11bd13
2021-03-11 05:14:25 +00:00
Jingwen Chen
878997f3aa
Merge "bp2build: add python_binary_host converter." am: 6aeb2911d8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622686
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I624edb913c9c572fda2e4c9cc87f000e8b3a8e44
2021-03-11 05:13:55 +00:00
Treehugger Robot
b3d6edd6c0
Merge "AIDEGen: Add "-fprofile-sample-use" parameter into category."
2021-03-11 04:34:02 +00:00
Jingwen Chen
6aeb2911d8
Merge "bp2build: add python_binary_host converter."
2021-03-11 04:21:41 +00:00
Treehugger Robot
261524634d
[automerger skipped] Merge "update apex/allowed_deps.txt" am: 215725913c
am: 1a690fcbbb
-s ours
...
am skip reason: Change-Id I0ea6b33c2d27081a5f0622edb0f5df4088a71455 with SHA-1 5225ca9434
is in history
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620685
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I432c029906ccb86f27f76cf7479bc651ea5961ee
2021-03-11 02:20:18 +00:00
Jaewoong Jung
4bd1fc1763
Merge "Lineage properties support module references." am: 6df5e0307d
am: c3df3c5396
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625101
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8541e1e2aa1e9866e7616167f3305e2cd9c53419
2021-03-11 02:19:57 +00:00
Paul Duffin
4ea76e8caf
Merge "Avoid calling DepIsInSameApex when excluded from apex contents" am: 9c2e6d50b4
am: 46a694ba85
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626500
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If3b078034869c482a624c66b1093fb97e0ae6871
2021-03-11 02:19:40 +00:00
Paul Duffin
e6bced0c4f
Merge "Convert etc tests to use test fixtures" am: 38cf70a088
am: 6c4d061ad5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625390
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I58c0b7c4263aa496842048e5be282bbde22798fd
2021-03-11 02:19:21 +00:00
Colin Cross
72241f12c0
Merge "Add comment to lintPaths" am: 42e49979f2
am: 8aac2c3dd5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1624661
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib48bcb25eb1b6eb49ace54675e9eab42300e103c
2021-03-11 02:19:00 +00:00
Treehugger Robot
1a690fcbbb
Merge "update apex/allowed_deps.txt" am: 215725913c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620685
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ide52f42cf6019d0f3935c5253b6cd7d09ee9c63c
2021-03-11 02:05:47 +00:00
Jaewoong Jung
c3df3c5396
Merge "Lineage properties support module references." am: 6df5e0307d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625101
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7fb218215e9b8c7395756ccbd78edf6674b259ad
2021-03-11 02:00:38 +00:00
Paul Duffin
46a694ba85
Merge "Avoid calling DepIsInSameApex when excluded from apex contents" am: 9c2e6d50b4
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626500
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ief63f1156c7db836343032eb1846a23286b99ea6
2021-03-11 01:58:08 +00:00
Paul Duffin
6c4d061ad5
Merge "Convert etc tests to use test fixtures" am: 38cf70a088
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625390
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7f493df3148c0610374cf1a6b1b4dca64d5f5fec
2021-03-11 01:56:53 +00:00
Treehugger Robot
215725913c
Merge "update apex/allowed_deps.txt"
2021-03-11 01:35:46 +00:00
Jaewoong Jung
6df5e0307d
Merge "Lineage properties support module references."
2021-03-11 00:59:32 +00:00
Colin Cross
8aac2c3dd5
Merge "Add comment to lintPaths" am: 42e49979f2
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1624661
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6f65aebc59148f74b9b603a6733bcb477ef4576c
2021-03-10 23:31:24 +00:00
Paul Duffin
9c2e6d50b4
Merge "Avoid calling DepIsInSameApex when excluded from apex contents"
2021-03-10 23:30:48 +00:00
Paul Duffin
38cf70a088
Merge "Convert etc tests to use test fixtures"
2021-03-10 23:24:04 +00:00
Colin Cross
dbbe1d6da5
Merge "Revert "Skip old file cleanup for non-full builds."" am: 75a38ba791
am: 0fe5a48ccc
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625059
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5a241f7e6a808855b6b460c85e306859bb5d5754
2021-03-10 23:14:12 +00:00
Paul Duffin
05d6367813
Merge "Support test fixtures in java package" am: 29e98e5ede
am: 1d58079c9c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625388
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I04d2ad1baa81b48eb8e53e3adc42751faebf613c
2021-03-10 23:14:07 +00:00
Paul Duffin
86c61b54d3
Merge "Support test fixtures in dexpreopt package" am: 4ce31e448f
am: 5a9dbbbb92
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625387
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0129350513b4282c73b6c8c6c5acbcffcdd9da2b
2021-03-10 23:14:02 +00:00
Paul Duffin
020cd977dc
Merge changes Ib2c6ac28,I7c76ed6d,I00415f10,I4be2a16c,I6f269c9c, ... am: 67e848ab04
am: 07d76a4ec2
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625385
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I16a3907d18a0a7f3cb56aeb08bf1226f023aa089
2021-03-10 23:13:57 +00:00
Paul Duffin
a97f71698c
Merge "Convert genrule tests to use test fixtures" am: 6edc952d89
am: a11ec1f568
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1619324
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I238d4404ff4ac0c3c57c67c00970f446dc5ffc7a
2021-03-10 23:13:46 +00:00
Colin Cross
0fe5a48ccc
Merge "Revert "Skip old file cleanup for non-full builds."" am: 75a38ba791
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625059
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If3186c4eeb2d83cc57e422190e7b24be13d49b98
2021-03-10 23:08:18 +00:00
Paul Duffin
1d58079c9c
Merge "Support test fixtures in java package" am: 29e98e5ede
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625388
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I95df61b5ae8df324258623c760f9ece1c4a0c1e5
2021-03-10 23:05:24 +00:00
Paul Duffin
5a9dbbbb92
Merge "Support test fixtures in dexpreopt package" am: 4ce31e448f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625387
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If611e62cdd301efb7899221ba34fbc179ba33a9f
2021-03-10 23:04:49 +00:00
Colin Cross
42e49979f2
Merge "Add comment to lintPaths"
2021-03-10 22:55:03 +00:00
Colin Cross
75a38ba791
Merge "Revert "Skip old file cleanup for non-full builds.""
2021-03-10 22:53:43 +00:00
Paul Duffin
07d76a4ec2
Merge changes Ib2c6ac28,I7c76ed6d,I00415f10,I4be2a16c,I6f269c9c, ... am: 67e848ab04
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625385
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic13069217603fb937f20712dd67fe03ecd52ea97
2021-03-10 22:49:56 +00:00
Paul Duffin
a11ec1f568
Merge "Convert genrule tests to use test fixtures" am: 6edc952d89
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1619324
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ica7711f65261ff51862424b5c8f3611a0322aa9d
2021-03-10 22:33:16 +00:00
Paul Duffin
29e98e5ede
Merge "Support test fixtures in java package"
2021-03-10 22:27:00 +00:00
Paul Duffin
4ce31e448f
Merge "Support test fixtures in dexpreopt package"
2021-03-10 22:04:31 +00:00
Paul Duffin
67e848ab04
Merge changes Ib2c6ac28,I7c76ed6d,I00415f10,I4be2a16c,I6f269c9c, ...
...
* changes:
Support test fixtures in sh package
Support test fixtures in bpf package
Support test fixtures in cc package
Add temporary RunTestWithConfig method to simplify migration
Support test fixtures in etc package
Convert license tests to use test fixtures
2021-03-10 21:52:17 +00:00
Paul Duffin
6edc952d89
Merge "Convert genrule tests to use test fixtures"
2021-03-10 21:51:47 +00:00
Paul Duffin
010db8f3d3
Merge "Remove duplicate sdk.TestHelper" am: 3b2636fdf3
am: a4513a42db
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625389
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iac586ddcede0533081699f9096eea2ba9f94672b
2021-03-10 20:32:14 +00:00
Colin Cross
c6b8d7f70e
Merge changes from topic "lint_rbe" am: 068f33f6cf
am: d475665a61
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621780
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib93088ac7ffae99efebbfd8dc372724d80bd77e0
2021-03-10 20:32:04 +00:00
Paul Duffin
a4513a42db
Merge "Remove duplicate sdk.TestHelper" am: 3b2636fdf3
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625389
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id752a1f90ee457053d67099d8755ed0be02a79ca
2021-03-10 20:27:14 +00:00
Paul Duffin
9fb55797b4
Merge "Simplify TestSdkInstall" am: 19afb3c0c3
am: 1553539301
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625381
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia24a47ac0f70e1a99fe2d0cf1ca72db98fbbb9fd
2021-03-10 20:13:23 +00:00
Colin Cross
d475665a61
Merge changes from topic "lint_rbe" am: 068f33f6cf
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621780
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9f00672cd11d70f34cf283378c907a8b168715dc
2021-03-10 20:13:18 +00:00
Paul Duffin
b5424164d9
Merge "Extract sdk registration code into function for reuse" am: 8bee400a74
am: df21923819
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625380
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I74690de8389476de26f61450b0a6394303f32bd0
2021-03-10 20:13:17 +00:00
Paul Duffin
0f9e7887fa
Merge "Extract apex registration code into function for reuse" am: 3d3f7a0c3f
am: 5dccf644f1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625379
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2c20a0a5a5fed0aae8cdbdb678f09474e09d8324
2021-03-10 20:12:30 +00:00
Paul Duffin
3b2636fdf3
Merge "Remove duplicate sdk.TestHelper"
2021-03-10 19:59:56 +00:00