Commit Graph

39327 Commits

Author SHA1 Message Date
Paul Duffin
d46309e3ad Merge "Correct typo in the name of compatConfigTag" am: 603fa13e08 am: 7eccf3774b am: 0176573920
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642108

Change-Id: I57c8dda9dfc4eac6d6b1e51de84fb70b01ec6109
2021-03-18 15:16:53 +00:00
Paul Duffin
26b1da534b Merge "Allow apex dependencies to be restricted to source modules only" am: c0a5ccbf3b am: 69f4244007 am: 25703000a5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642107

Change-Id: I1aa04096592ef837d29dde57c8a53b117143c9fd
2021-03-18 15:16:46 +00:00
Paul Duffin
0361e84a24 Merge "Separate metadata provider from apex contents provider" am: 533cf74318 am: 1d83ba3a10 am: 126181b054
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642106

Change-Id: I4c0c6c5fd83472322bb152650a8c07debfeb5d57
2021-03-18 15:16:38 +00:00
Paul Duffin
54f6aae507 Merge "Add AssertIntEquals" am: a8c065522d am: 308053d678 am: 96c9a5fc28
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643062

Change-Id: I4c2a319f82dc07e660515c8e0aaf9655f7664bf6
2021-03-18 15:16:31 +00:00
Paul Duffin
b34c8bb1dd Merge "Add emptyFixtureFactory in java package" am: 93b61b49dd am: f2dec10262 am: 22ec063dff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642105

Change-Id: I0a53f4b11d41d440745aff9966efae725d3f2471
2021-03-18 15:16:22 +00:00
Paul Duffin
6e55c425b8 Merge "Reorganize the platform_compat_config.go file" am: 177cba31cf am: 95b93bf6a8 am: ef3ada76c4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642104

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

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

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

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

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

Change-Id: Ie0e3769750189209cdd88beb035beda0cb3af5e9
2021-03-18 15:15:26 +00:00
Ulyana Trafimovich
928c87711a Revert^2 "Don't depend on nonexistent manifest when manifest_check is disabled."
Reason for revert: relanding original change. The fix was to add AAPT to
the dependencies of the failed command. It didn't fail in AOSP, and on
some targets in sc-dev, because the build order happened to be different
and AAPT was built by the time it was needed. This also explains why
some builds oscillated between red and green.

Reverted Changes:
I52f00c9f4:Revert "Don't depend on nonexistent manifest when ...
I4c2d4e1c7:Revert "Reimplement verify_uses_libraries.sh in ma...
Ibebd616a7:Revert "Reimplement verify_uses_libraries.sh in ma...

Bug: 132357300
Bug: 183010666
Change-Id: I28b20308f4d68185af8ec15407b35ded1aaa2eb0
Test: treehugger
Test: forrest on git_sc-dev target aosp_blueline-userdebug
2021-03-18 11:43:06 +00:00
Ulyana Trafimovich
ec22282610 Revert^2 "Reimplement verify_uses_libraries.sh in manifest_check.py."
Reason for revert: relanding original change. The fix was to add AAPT to
the dependencies of the failed command. It didn't fail in AOSP, and on
some targets in sc-dev, because the build order happened to be different
and AAPT was built by the time it was needed. This also explains why
some builds oscillated between red and green.

Reverted Changes:
I52f00c9f4:Revert "Don't depend on nonexistent manifest when ...
I4c2d4e1c7:Revert "Reimplement verify_uses_libraries.sh in ma...
Ibebd616a7:Revert "Reimplement verify_uses_libraries.sh in ma...

Bug: 132357300
Bug: 183010666
Change-Id: I6fd3935e951503b6c505b1e45b27bb8dc498665a
Test: treehugger
Test: forrest on git_sc-dev target aosp_blueline-userdebug
2021-03-18 11:42:53 +00:00
Lukács T. Berki
4a581ea4ca Merge "Fix writing soong.variables ." am: 828b1e99ec am: 85787f8720 am: 8f35b4df58
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1641405

Change-Id: I1ef94c752459994c75248d9525fab6eadad87c40
2021-03-18 09:39:52 +00:00
Paul Duffin
0176573920 Merge "Correct typo in the name of compatConfigTag" am: 603fa13e08 am: 7eccf3774b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642108

Change-Id: I68e973776e85b2966ca182eb21d9fa4296c2cee0
2021-03-18 09:13:44 +00:00
Paul Duffin
25703000a5 Merge "Allow apex dependencies to be restricted to source modules only" am: c0a5ccbf3b am: 69f4244007
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642107

Change-Id: I97bdc2f4f20f15bc72708f461eb05d9f2a2e597d
2021-03-18 09:13:38 +00:00
Paul Duffin
126181b054 Merge "Separate metadata provider from apex contents provider" am: 533cf74318 am: 1d83ba3a10
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642106

Change-Id: I96b09fd79851a036c6a420d9d3f5d27e5950f250
2021-03-18 09:13:33 +00:00
Paul Duffin
96c9a5fc28 Merge "Add AssertIntEquals" am: a8c065522d am: 308053d678
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643062

Change-Id: I2326d1d0afa34d80f8c9f3782d7b78eea3042c3c
2021-03-18 09:13:26 +00:00
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
7eccf3774b Merge "Correct typo in the name of compatConfigTag" am: 603fa13e08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642108

Change-Id: If070b560f51925193e504017f59047670930a172
2021-03-18 08:55:41 +00:00
Paul Duffin
69f4244007 Merge "Allow apex dependencies to be restricted to source modules only" am: c0a5ccbf3b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642107

Change-Id: Ic8455ee25a714bac4113b62f1b60aeb51c3095c5
2021-03-18 08:55:32 +00:00
Paul Duffin
1d83ba3a10 Merge "Separate metadata provider from apex contents provider" am: 533cf74318
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642106

Change-Id: I83083ae32b307c648e6b8d482fd639a38c2e62c7
2021-03-18 08:55:24 +00:00
Paul Duffin
308053d678 Merge "Add AssertIntEquals" am: a8c065522d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643062

Change-Id: I4aadae5694e78f508037525fada874a79eb6c57a
2021-03-18 08:55:15 +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
603fa13e08 Merge "Correct typo in the name of compatConfigTag" 2021-03-18 08:48:36 +00:00
Paul Duffin
c0a5ccbf3b Merge "Allow apex dependencies to be restricted to source modules only" 2021-03-18 08:48:05 +00:00
Paul Duffin
533cf74318 Merge "Separate metadata provider from apex contents provider" 2021-03-18 08:46:49 +00:00
Paul Duffin
a8c065522d Merge "Add AssertIntEquals" 2021-03-18 08:42:16 +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