Commit Graph

34754 Commits

Author SHA1 Message Date
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
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
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
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
Lukács T. Berki
e108ab7b8d Merge "Fix writedocs." am: dfa33be445 am: 9632e13c5a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626499

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01177e764e319b7f6a2ad59a18fe34440a2d66f5
2021-03-11 08:26:16 +00:00
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
Lukacs T. Berki
21d5c7aaa9 Hard-wire the path to xcrun as /usr/bin/xcrun.
This lets us not leak $PATH to soong_build. It was only needed for
Darwin tests anyway.

Test: Will ask jingwen@ who has a Mac.
Change-Id: I4647e41275b323fe6283580f8f92718c6229f23e
2021-03-11 08:52:39 +01:00
Lukács T. Berki
9632e13c5a Merge "Fix writedocs." am: dfa33be445
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626499

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2b8770caae1621e09d4efacdfffd8d334ac387c
2021-03-11 07:52:06 +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
dfa33be445 Merge "Fix writedocs." 2021-03-11 07:38:42 +00:00
Lukacs T. Berki
81a6983dc2 Fix writedocs.
This probably got broken by aosp/1609473 because soong_build is now
invoked in two different ways:

- By its absolute path during building out/soong/build.ninja
- By its path relative to the source root when generating documentation

Bug: 182347000
Test: Manual (the long incantation on b/182347000)
Change-Id: I0a3a97e4865ffde4a450a3f7baf3980b5a2016c8
2021-03-11 08:37:01 +01:00
Paul Duffin
93706aeef2 Add AssertStringListContains to TestHelper
Bug: 181070625
Test: m nothing
Change-Id: I5b36b748a2f0b7c189aa9e12cf0ad0f663c92a9a
2021-03-11 07:26:19 +00:00
Paul Duffin
ecdac8a6d6 Convert fuchsia tests to use test fixtures
Bug: 181070625
Test: m nothing
Change-Id: Ic2b86f7c603ff1c4b48884cb58908db536d98f37
2021-03-11 07:26:11 +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