Colin Cross
cbd14768a4
Merge "Remove extra return value from testApex" am: 110bca5bd1
am: f686c21c3b
am: bbf3dcf9ec
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1590978
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e904bf0966fcf1f402daeba5b79486d725c5b35
2021-03-08 20:15:03 +00:00
Colin Cross
bbf3dcf9ec
Merge "Remove extra return value from testApex" am: 110bca5bd1
am: f686c21c3b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1590978
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie3887d404da1c6be15e591ecc389cab72826bef5
2021-03-08 19:28:35 +00:00
Colin Cross
f686c21c3b
Merge "Remove extra return value from testApex" am: 110bca5bd1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1590978
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib3a27132b2c45fe2f71546c33e334abdf292994b
2021-03-08 18:43:03 +00:00
Colin Cross
110bca5bd1
Merge "Remove extra return value from testApex"
2021-03-08 18:16:23 +00:00
TreeHugger Robot
e7b67eb018
Merge "Add statslog_media dependency to media module." into sc-dev
2021-03-08 18:01:32 +00:00
Lukacs T. Berki
15690a59e7
Fix queryview. am: 89071b08c7
am: f101ca3821
am: 883ad521d2
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622424
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2a55e67a69756850c57bb45ffce3204bce3520f3
2021-03-08 17:07:12 +00:00
Lukacs T. Berki
883ad521d2
Fix queryview. am: 89071b08c7
am: f101ca3821
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622424
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I070b63eba2557d91b2b5b2812f656a6f2f81cfe6
2021-03-08 16:22:28 +00:00
Lukacs T. Berki
f101ca3821
Fix queryview. am: 89071b08c7
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622424
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I627aa12c63b1336c20493d280341f9760ceeeb78
2021-03-08 15:44:49 +00:00
Anton Hansson
d4c3be1101
[automerger skipped] Merge "Allow PermissionController to set min_sdk_version to 30." am: 921a89e376
am: 328bb54dab
am: 6b9ef0da30
-s ours
...
am skip reason: Change-Id I5c98dc0053687bd4601ab06f6e092aeb851cdba7 with SHA-1 5682393a39
is in history
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621413
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7c82a8f348e34c4affc5331b31d6a8caf8aeed74
2021-03-08 12:43:00 +00:00
Nicolas Geoffray
a092241ed8
Merge "Stop using '&' for class loader context." am: b4f9d5c837
am: 1841eee637
am: 0ae769ac65
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1606853
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8c11853132260db1961fd7729873d62f5f196be1
2021-03-08 12:42:45 +00:00
Lukacs T. Berki
41b554432f
Make it possible to debug soong_ui. am: 7d613bfe2c
am: 1965f831da
am: 968eed4ada
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1610785
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If063936594060bfb14c9636c7c345c355bec6e75
2021-03-08 12:42:32 +00:00
Anton Hansson
6b9ef0da30
Merge "Allow PermissionController to set min_sdk_version to 30." am: 921a89e376
am: 328bb54dab
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621413
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9c278a129377a25f011353e400826006ecb74865
2021-03-08 12:24:02 +00:00
Nicolas Geoffray
0ae769ac65
Merge "Stop using '&' for class loader context." am: b4f9d5c837
am: 1841eee637
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1606853
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If360257f4b2a36144e23db2b08707a770e942592
2021-03-08 12:18:28 +00:00
Lukacs T. Berki
968eed4ada
Make it possible to debug soong_ui. am: 7d613bfe2c
am: 1965f831da
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1610785
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic0bdf5511ef456e0c2b389d1baccffd5ce63afd0
2021-03-08 12:18:06 +00:00
Lukacs T. Berki
89071b08c7
Fix queryview.
...
This got broken by aosp/1610785 which changed the assumptions
soong_build makes about its environment.
At that time, I didn't know that queryview also invokes soong_build
through another pathway.
Test: Manual: "m queryview && m nothing"
Change-Id: I06ed42aee0d97e18f634eeeaca37108009b29d78
2021-03-08 13:05:20 +01:00
Anton Hansson
328bb54dab
Merge "Allow PermissionController to set min_sdk_version to 30." am: 921a89e376
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621413
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5fbea185f61e0711150c77df96056320f352bd73
2021-03-08 11:57:57 +00:00
Nicolas Geoffray
1841eee637
Merge "Stop using '&' for class loader context." am: b4f9d5c837
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1606853
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I58460a59909565d2986634097674a5792843f9c8
2021-03-08 11:57:10 +00:00
Lukacs T. Berki
1965f831da
Make it possible to debug soong_ui. am: 7d613bfe2c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1610785
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I17dfd06e6c11b450d72a81f95986232c534af96b
2021-03-08 11:56:32 +00:00
Anton Hansson
921a89e376
Merge "Allow PermissionController to set min_sdk_version to 30."
2021-03-08 11:18:16 +00:00
Nicolas Geoffray
b4f9d5c837
Merge "Stop using '&' for class loader context."
2021-03-08 11:16:09 +00:00
Lukacs T. Berki
7d613bfe2c
Make it possible to debug soong_ui.
...
This works by setting the SOONG_UI_DELVE= environment variable to the
port on which soong_ui should accept a Delve connection on.
This is achieved by reusing the Delve execution logic between soong_ui
and soong_build.
Test: Manual.
Change-Id: Id2c1d4b6faac1a4a3918c91030ce2239f7daf54f
2021-03-08 08:27:58 +01:00
Paul Duffin
381bd33c04
Merge "Fix build break caused by registering genrules twice" am: 6d3e726887
am: bbb10d2452
am: 6ce4598e3c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621418
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8970e441a817db83cbf64623954e51c814cf4ada
2021-03-06 11:53:35 +00:00
Paul Duffin
266f3ef840
Merge "Do not ignore error when writing environment file" am: 77bfa3e792
am: e6583468ed
am: 180b50c12f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620786
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9250989cdc5ff41b7ab9c97041b611732ecccc6c
2021-03-06 11:53:23 +00:00
Paul Duffin
6ce4598e3c
Merge "Fix build break caused by registering genrules twice" am: 6d3e726887
am: bbb10d2452
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621418
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie7ca9769d8c7fa29e21afc15377eb5e52d0bfb5c
2021-03-06 11:11:17 +00:00
Paul Duffin
180b50c12f
Merge "Do not ignore error when writing environment file" am: 77bfa3e792
am: e6583468ed
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620786
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I34e9f0f13e8395b13120bf4d59121a63e5e28736
2021-03-06 11:11:03 +00:00
Paul Duffin
bbb10d2452
Merge "Fix build break caused by registering genrules twice" am: 6d3e726887
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621418
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I81a768a5fad19a3ae12fe6f73d836dd010545bdf
2021-03-06 10:33:51 +00:00
Paul Duffin
e6583468ed
Merge "Do not ignore error when writing environment file" am: 77bfa3e792
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620786
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I646e9fa457512eea90067e0a9e193ea17a6ce002
2021-03-06 10:33:08 +00:00
Paul Duffin
6d3e726887
Merge "Fix build break caused by registering genrules twice"
2021-03-06 10:09:15 +00:00
Paul Duffin
cdcd2be1ff
Fix build break caused by registering genrules twice
...
Two separate changes that passed presubmits separately and did not
conflict when merged together unfortunately clashed at runtime. The
changes are:
* Ic00c7e480dc738d7a88d038aca6ab95a1502a24a
* Ic98fdc29a63155174a3227e7e918b26f0a8763bb
Test: m nothing
Change-Id: I7b5704c22cc2ea2095f5fb92c59f0526bb445f13
2021-03-06 10:03:22 +00:00
Paul Duffin
77bfa3e792
Merge "Do not ignore error when writing environment file"
2021-03-06 09:57:36 +00:00
Paul Duffin
58fc2a8ea8
Merge "Add Errs to TestResult" am: 6bd87750ae
am: df4a0d874d
am: 2e8de50c0e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1619408
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5504b51bb387a595bb7b6be2611e8f5c96a3f07d
2021-03-06 09:57:20 +00:00
Paul Duffin
7c0e9bc794
Merge "Make error handlers treat any failures as fatal" am: 059f7f1ff3
am: 163f65aa28
am: 342f88f999
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1619407
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6f4c8737a739ef770becef4b8181339c76bbc6d8
2021-03-06 09:57:13 +00:00
Paul Duffin
d69af7b99e
Merge "Avoid SetErrorHandler mutating FixtureFactory" am: 87d7dd918a
am: 672cf221da
am: 9524aa2cd4
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1619409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7682121189ef721fd9124a581ceb032e05e67c21
2021-03-06 09:57:05 +00:00
Paul Duffin
8d74783b41
Merge "Clean up cc.RegisterRequiredBuildComponentsForTest()" am: 0805d4ebdd
am: b6ae322278
am: 1f50ff0df6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621414
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I22877e0de75fbb1f4899fad3081418acf3b6df74
2021-03-06 09:56:58 +00:00
Paul Duffin
48dc07c9fe
Merge "Rename FixturePreparers to GroupFixturePreparers" am: 166a488efe
am: 673bce632a
am: 661f39a01d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1612943
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3df8b5266b742f8425bb0e78b9d4bf17f7097bc9
2021-03-06 09:56:52 +00:00
Paul Duffin
1c58ce4a52
Merge "Fix mutator ordering issue in apex tests" am: 97c8128eea
am: d8033e1d26
am: e672daac6b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621415
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifa3b28737bcf55fb5ccda37e3e4dec4973cf8e34
2021-03-06 09:56:43 +00:00
Treehugger Robot
6ed3f27e53
Merge "Remove wired corpus name, use the one from the environment" am: d8570b3077
am: 4124d9610f
am: 82ebdbe1a7
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622005
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ide3ba4bb370161cc89f507a98494fc3aafd10141
2021-03-06 09:56:27 +00:00
Paul Duffin
2e8de50c0e
Merge "Add Errs to TestResult" am: 6bd87750ae
am: df4a0d874d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1619408
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0ca8d07156a0097b5775f14dc62a63fdfe41bfef
2021-03-06 09:06:55 +00:00
Paul Duffin
342f88f999
Merge "Make error handlers treat any failures as fatal" am: 059f7f1ff3
am: 163f65aa28
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1619407
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic5bfd923e0e5e04ad0c7554ec7101d84d93f6566
2021-03-06 09:06:48 +00:00
Paul Duffin
9524aa2cd4
Merge "Avoid SetErrorHandler mutating FixtureFactory" am: 87d7dd918a
am: 672cf221da
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1619409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I55aeed5047af0bf47f5a8d74ab209b2e8bf5bad5
2021-03-06 09:06:37 +00:00
Paul Duffin
1f50ff0df6
Merge "Clean up cc.RegisterRequiredBuildComponentsForTest()" am: 0805d4ebdd
am: b6ae322278
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621414
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I98e32ff064e2d6617387c55a9eb4d8e331d0d17b
2021-03-06 09:06:22 +00:00
Paul Duffin
661f39a01d
Merge "Rename FixturePreparers to GroupFixturePreparers" am: 166a488efe
am: 673bce632a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1612943
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I91b63ad522aaf956adf27e6e5d18ff815e49bf0c
2021-03-06 09:06:15 +00:00
Paul Duffin
e672daac6b
Merge "Fix mutator ordering issue in apex tests" am: 97c8128eea
am: d8033e1d26
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621415
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I84cb412a6a78c132107f962e3d746f7c5941c2e3
2021-03-06 09:06:03 +00:00
Treehugger Robot
82ebdbe1a7
Merge "Remove wired corpus name, use the one from the environment" am: d8570b3077
am: 4124d9610f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622005
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idb0828fd63b485ec9d07904e5d4c7aad937f69d7
2021-03-06 09:05:42 +00:00
Paul Duffin
df4a0d874d
Merge "Add Errs to TestResult" am: 6bd87750ae
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1619408
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I64298e75715678c124dcc736582de262699599b3
2021-03-06 08:48:09 +00:00
Paul Duffin
163f65aa28
Merge "Make error handlers treat any failures as fatal" am: 059f7f1ff3
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1619407
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id44496b718567ac4258f268639e1e8e902904cb8
2021-03-06 08:47:59 +00:00
Paul Duffin
672cf221da
Merge "Avoid SetErrorHandler mutating FixtureFactory" am: 87d7dd918a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1619409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I93dd6c172359744bd88b9080e5a65af6b27c6bcf
2021-03-06 08:47:49 +00:00
Paul Duffin
b6ae322278
Merge "Clean up cc.RegisterRequiredBuildComponentsForTest()" am: 0805d4ebdd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621414
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I587cd237e6a3385edcc7b230ca39522d36b35463
2021-03-06 08:47:41 +00:00
Paul Duffin
673bce632a
Merge "Rename FixturePreparers to GroupFixturePreparers" am: 166a488efe
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1612943
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iee52dc35dc83a9f77b227f5506c7c480dc9af129
2021-03-06 08:47:32 +00:00
Paul Duffin
d8033e1d26
Merge "Fix mutator ordering issue in apex tests" am: 97c8128eea
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621415
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5f14eb119898c41cea5fb4b0f67b492ec1978979
2021-03-06 08:47:18 +00:00