Commit Graph

35114 Commits

Author SHA1 Message Date
Paul Duffin
22ec063dff Merge "Add emptyFixtureFactory in java package" am: 93b61b49dd am: f2dec10262
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642105

Change-Id: Ice08a34e362e1d50ae953a3f68a3db31e2398522
2021-03-18 09:13:20 +00:00
Paul Duffin
ef3ada76c4 Merge "Reorganize the platform_compat_config.go file" am: 177cba31cf am: 95b93bf6a8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642104

Change-Id: I282d3c89167ec58b9b424c5d7b5ee01ca1cfbbd9
2021-03-18 09:13:14 +00:00
Paul Duffin
b7200fc522 Merge "Add preparers for python" am: f49f72f271 am: dca128e44a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643943

Change-Id: I67128d1e938020770d60b3dff7c669a9d7864507
2021-03-18 09:13:07 +00:00
Paul Duffin
f2dec10262 Merge "Add emptyFixtureFactory in java package" am: 93b61b49dd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642105

Change-Id: I7b0434c39d81563aa6e293ca83edb5fb04ad93a7
2021-03-18 08:55:06 +00:00
Paul Duffin
95b93bf6a8 Merge "Reorganize the platform_compat_config.go file" am: 177cba31cf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642104

Change-Id: I0800fd26c99a26ea6b86af099ae5487e325922f1
2021-03-18 08:54:57 +00:00
Paul Duffin
dca128e44a Merge "Add preparers for python" am: f49f72f271
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643943

Change-Id: I85699bfb7220dc9f44abe665a4f86967ccd9a616
2021-03-18 08:54:44 +00:00
Paul Duffin
f3c3e60623 Merge "Fix hole in python testing code that ignored a broken test" am: 0a00e2680d am: 21a1d22ec3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643942

Change-Id: I4afed13f2f1ac1d5916f6a79e505172bd3135581
2021-03-18 08:54:41 +00:00
Paul Duffin
8255a16c37 Merge "Fix app tests to work without javaMockFS()" am: e26e597fc8 am: 9679be9ea5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634633

Change-Id: I402492eedbecf7db1d37d14791ff42fd096912b4
2021-03-18 08:54:35 +00:00
Paul Duffin
59ff1fbc73 Merge "Convert app tests that depend on javaMockFS() to test fixtures" am: 9e993c6162 am: 85bcdfcb3c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634632

Change-Id: I9fb3e99104264bb607ca7d14234d559794948555
2021-03-18 08:54:26 +00:00
Paul Duffin
13b31ab6f2 Merge "Convert TestUsesLibraries to test fixtures" am: 8a6fef4db3 am: 3e2173905d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634631

Change-Id: Iac19b34bbca50601ab205a55ea4e139a85ad35b5
2021-03-18 08:54:20 +00:00
Lukács T. Berki
8f35b4df58 Merge "Fix writing soong.variables ." am: 828b1e99ec am: 85787f8720
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1641405

Change-Id: I52e48c4cf2df0b12b0d599c7cd0f25b0be029aea
2021-03-18 08:54:11 +00:00
Paul Duffin
21a1d22ec3 Merge "Fix hole in python testing code that ignored a broken test" am: 0a00e2680d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643942

Change-Id: I41ed6dc12e3202730fae9fa94aa457768925c73c
2021-03-18 08:54:05 +00:00
Paul Duffin
93b61b49dd Merge "Add emptyFixtureFactory in java package" 2021-03-18 08:40:03 +00:00
Paul Duffin
177cba31cf Merge "Reorganize the platform_compat_config.go file" 2021-03-18 08:39:39 +00:00
Paul Duffin
f49f72f271 Merge "Add preparers for python" 2021-03-18 08:28:35 +00:00
Paul Duffin
0a00e2680d Merge "Fix hole in python testing code that ignored a broken test" 2021-03-18 08:28:10 +00:00
Paul Duffin
9679be9ea5 Merge "Fix app tests to work without javaMockFS()" am: e26e597fc8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634633

Change-Id: I045684237af489507cc6436b760c41e94dac8bce
2021-03-18 08:17:36 +00:00
Paul Duffin
85bcdfcb3c Merge "Convert app tests that depend on javaMockFS() to test fixtures" am: 9e993c6162
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634632

Change-Id: I6fdf8082b84ad606534b332867e274829a3f969e
2021-03-18 08:17:26 +00:00
Paul Duffin
3e2173905d Merge "Convert TestUsesLibraries to test fixtures" am: 8a6fef4db3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634631

Change-Id: I9845d1bc4e2e1b8663d8d6c1fc982c4741c7b672
2021-03-18 08:17:17 +00:00
Lukács T. Berki
85787f8720 Merge "Fix writing soong.variables ." am: 828b1e99ec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1641405

Change-Id: I80ae7c3fa8209791444ded7e611864ecc36c9256
2021-03-18 08:16:37 +00:00
Paul Duffin
e26e597fc8 Merge "Fix app tests to work without javaMockFS()" 2021-03-18 08:00:29 +00:00
Paul Duffin
9e993c6162 Merge "Convert app tests that depend on javaMockFS() to test fixtures" 2021-03-18 07:59:54 +00:00
Paul Duffin
8a6fef4db3 Merge "Convert TestUsesLibraries to test fixtures" 2021-03-18 07:59:04 +00:00
Lukács T. Berki
828b1e99ec Merge "Fix writing soong.variables ." 2021-03-18 07:36:53 +00:00
Pirama Arumuga Nainar
3cf5deb219 Merge "Update clang used for bindgen to clang-r412851" am: 5ef0c52bdf am: 638bcda667
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642782

Change-Id: I93de88527ba13d792d43fe6add139afbdb76bb2d
2021-03-18 01:00:33 +00:00
Pirama Arumuga Nainar
638bcda667 Merge "Update clang used for bindgen to clang-r412851" am: 5ef0c52bdf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642782

Change-Id: I373a80062d2f81ac12dbeae07d459e03255a02d2
2021-03-18 00:43:38 +00:00
Jiyong Park
94e1d3b56b Merge "Add vbmeta module type" am: e7569bc544 am: dd945e2f0e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1636160

Change-Id: I03a3ff2d22cb66d3e64700433fde5dd8458d62fc
2021-03-18 00:42:53 +00:00
Treehugger Robot
f6a004a40c Merge "bootimg signs image using verity_utils" am: ab534a3b5c am: dfda472219
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1636159

Change-Id: Ie115d18eefc33a9eea46fbfa90ec794dbf3f180b
2021-03-18 00:42:43 +00:00
Pirama Arumuga Nainar
5ef0c52bdf Merge "Update clang used for bindgen to clang-r412851" 2021-03-18 00:27:30 +00:00
Jiyong Park
dd945e2f0e Merge "Add vbmeta module type" am: e7569bc544
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1636160

Change-Id: I9e2b1e495d021e151f10c59ec391b0c29608ea92
2021-03-18 00:04:55 +00:00
Treehugger Robot
dfda472219 Merge "bootimg signs image using verity_utils" am: ab534a3b5c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1636159

Change-Id: I462d69aaf03aa6c0c0e98269b2696ca58948e959
2021-03-18 00:04:06 +00:00
Jiyong Park
e7569bc544 Merge "Add vbmeta module type" 2021-03-18 00:02:41 +00:00
Paul Duffin
d0890452e3 Add preparers for python
Bug: 181070625
Test: m nothing
Change-Id: I590ad62db6fd62719c83286780563cf6d55e3e17
2021-03-17 23:56:29 +00:00
Paul Duffin
c60dd805ad Fix hole in python testing code that ignored a broken test
The test running code would only check errors if there were any
reported. That ignored the "module with duplicate runfile path" test
which was not reporting the expected error.

This change corrects that mistake, and then fixes the test which had
started to fail.

It is possible that the failing test highlights a bug in the python
code but if so that will need to be fixed in a follow up bug.

Bug: 183046274
Test: m nothing
Change-Id: I961b15a452725e7b15ba9d21b4a4a672ba3d004a
2021-03-17 23:56:23 +00:00
Treehugger Robot
ab534a3b5c Merge "bootimg signs image using verity_utils" 2021-03-17 23:37:04 +00:00
TreeHugger Robot
b39e6fa1ad Merge "Move allowed_deps.txt to packages/modules/common." into rvc-qpr-dev-plus-aosp 2021-03-17 21:02:33 +00:00
Paul Duffin
afeee22c17 Add emptyFixtureFactory in java package
Bug: 182402754
Test: m nothing
Change-Id: I6a01b846a8aee5a0ace9e6ac056ee439bf6f12f7
2021-03-17 17:50:22 +00:00
Paul Duffin
961543309f Reorganize the platform_compat_config.go file
The types and methods are separated and interleaved with each other
so this moves them so that they are together.

Bug: 182402754
Test: m nothing
Change-Id: I275f6af30491d2440499b9ee3f201eea227d23f8
2021-03-17 17:50:22 +00:00
Pirama Arumuga Nainar
7b33d41170 Update clang used for bindgen to clang-r412851
Test: presubmit
Change-Id: I4883bd3c26a4037d01829c0806fc908b2c8e1c37
2021-03-17 10:37:51 -07:00
Colin Cross
463a363e9b Merge changes from topic "rule_builder_rsp" am: 45a4971808 am: c9332b4aa5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634805

Change-Id: Ic9bd53aa33041ff3492be610250b21c0903945c8
2021-03-17 15:50:51 +00:00
Colin Cross
27a4326c78 Add explicit rspfile argument to RuleBuilderCommand.FlagWithRspFileInputList am: 70c4741215 am: 37225a7b05
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634804

Change-Id: Iec8ea5fdda5786380e52d244d73e3dd182d7bc52
2021-03-17 15:50:48 +00:00
Colin Cross
9c79b0818d Ninja escape RuleBuilder rule params am: 4502978bee am: 1606582da1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640628

Change-Id: I43dbcb8fc4233a397ccbe23c9ac4d16ac797509c
2021-03-17 15:50:45 +00:00
Lukacs T. Berki
720b3964fe Fix writing soong.variables .
ConfiguredJarList had a marshaler but no unmarshaler.

Bug: 182965747
Test: Presubmits.
Change-Id: Id03669f4a0a3d389063a4e4b11af6d6be63dbba3
2021-03-17 16:35:13 +01:00
Colin Cross
c9332b4aa5 Merge changes from topic "rule_builder_rsp" am: 45a4971808
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634805

Change-Id: I881fee324890675467a45c88adc8c7537da6dd9d
2021-03-17 15:31:21 +00:00
Colin Cross
37225a7b05 Add explicit rspfile argument to RuleBuilderCommand.FlagWithRspFileInputList am: 70c4741215
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634804

Change-Id: Id1d3d6b1047f0492eaa88ada521dd8c4cdb22670
2021-03-17 15:31:16 +00:00
Colin Cross
1606582da1 Ninja escape RuleBuilder rule params am: 4502978bee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640628

Change-Id: I16d78d4b3c5810c1a34835cd96164a3c58dd67fc
2021-03-17 15:30:46 +00:00
Artur Satayev
f67c06a7f5 Move allowed_deps.txt to packages/modules/common.
Bug: 179234385
Test: run update-apex-allowed-deps.sh locally
Change-Id: I8e8864468b87342c688d001bc5f6e6f8416863ed
Merged-In: I8e8864468b87342c688d001bc5f6e6f8416863ed
2021-03-17 15:26:16 +00:00
Colin Cross
45a4971808 Merge changes from topic "rule_builder_rsp"
* changes:
  Remove unescaped spans support from RuleBuilder
  Add explicit rspfile argument to RuleBuilderCommand.FlagWithRspFileInputList
  Ninja escape RuleBuilder rule params
2021-03-17 15:14:19 +00:00
Lukacs T. Berki
63434875b5 Remove GeneratingPrimaryBuilder(). am: d7ce8402d8 am: a93b414edc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1636427

Change-Id: I4f980ce03e37ff23bc6c580c819d1368b0cdc306
2021-03-17 14:14:42 +00:00
Lukács T. Berki
02e1697d0a Merge "Embed minibp into soong_ui." am: 059972c214 am: b32ec546a1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1636426

Change-Id: Iddf9b8181cc0d14f779a1732ddcc1ccc9ac18548
2021-03-17 14:14:32 +00:00