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
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
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
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
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
Jaewoong Jung
aa3eac2e5b
Add data bin and lib properties to sh_test
...
This attempts to reland I7b64de4b06e9bba3fba3712b25dd9f9d112e1625
by fixing Mac-related test issues, yet again.
Test: sh_binary_test.go
Test: Modified ziptool-tests
Bug: 156980228
Merged-In: Id3952e136c1dabfcd34048b6c9f31d0125a623df
Change-Id: Id3952e136c1dabfcd34048b6c9f31d0125a623df
(cherry picked from commit 6e0eee522d
)
2021-03-11 10:17:02 +00:00
Lukács T. Berki
8da97ecddc
Merge "Fix writedocs." am: dfa33be445
am: 9632e13c5a
am: e108ab7b8d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626499
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9c8c6bd34c3977b97f3aa4a5ee8d550283ec0b85
2021-03-11 09:30:20 +00:00
Lukács T. Berki
4c02c2c337
Merge "Print a correct error message when a non-hermetic tool is not found." am: a55aefd57b
am: d922efecce
am: ee4a95f1b5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625979
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I81a7ec7d85e6c48032bcfed9ddf9f8dfd5f5f408
2021-03-11 09:30:12 +00:00
Lukács T. Berki
c5d4bef771
Merge "Fix the environment of soong_build:" am: 2373e597ea
am: 6222fd77f5
am: 6a4cb09496
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625980
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I05dbb9f639a6a97def0e8f13ec74560188e87f12
2021-03-11 09:29:43 +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
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
3ccb6af0e7
Merge "AIDEGen: Add "-fprofile-sample-use" parameter into category." am: b3d6edd6c0
am: d32045e2f3
am: 0a74edc095
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620690
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I390e6a4e1024d7343b4baa527f10b258b6f7e2a8
2021-03-11 06:30:59 +00:00
Jingwen Chen
68969dda36
Merge "bp2build: add python_binary_host converter." am: 6aeb2911d8
am: 878997f3aa
am: 84e4f6975d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622686
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaf359d221c7fc190142518b5e2fb2333b7478c1f
2021-03-11 06:30:44 +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
Chen Xu
42be01b733
Merge "include new settings lib to the apex-dependency allow list" into sc-dev
2021-03-11 04:51:40 +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
853ceac1d9
[automerger skipped] Merge "update apex/allowed_deps.txt" am: 215725913c
am: 1a690fcbbb
-s ours am: 261524634d
-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: If0eb1ef3c80d2bc1b4210fd4a74aab2d6a891c1e
2021-03-11 03:04:37 +00:00
Jaewoong Jung
bc098a5c26
Merge "Lineage properties support module references." am: 6df5e0307d
am: c3df3c5396
am: 4bd1fc1763
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625101
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id5f3b9ab9ba11e274a4921a9ab07392b1bb891ff
2021-03-11 03:04:25 +00:00
Paul Duffin
e5e761eab2
Merge "Avoid calling DepIsInSameApex when excluded from apex contents" am: 9c2e6d50b4
am: 46a694ba85
am: 4ea76e8caf
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626500
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib6248a20ea0b929286691a083fa5e5a93ea65285
2021-03-11 03:04:16 +00:00
Paul Duffin
ebf6cb10ad
Merge "Convert etc tests to use test fixtures" am: 38cf70a088
am: 6c4d061ad5
am: e6bced0c4f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625390
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I25339fa42e2f207bb8aeb437cff0c9142aedb6e9
2021-03-11 03:04:09 +00:00
Colin Cross
de2c316d39
Merge "Add comment to lintPaths" am: 42e49979f2
am: 8aac2c3dd5
am: 72241f12c0
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1624661
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I71f4ccd1d39a604f3dbd8d724d4abe8eb2939b84
2021-03-11 03:03:58 +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