Commit Graph

35462 Commits

Author SHA1 Message Date
Paul Duffin
29950e79a3 Merge changes Iccba8caf,I1eb49f25,Id77575f8,I5679cb51,I7f9f3eb6, ... am: 387f4ce1ee am: 2101267467
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1645097

Change-Id: I77ad253f31fba8bfc69681e6ec354d5e55feb2bb
2021-03-18 23:05:17 +00:00
Paul Duffin
9bf7277536 Merge changes I2e69e7b5,I3c9c36e7 am: 000ae662fa am: dd9e5e311e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643947

Change-Id: I71add604ef5e7b9929e192feb81a6924e22da836
2021-03-18 23:04:07 +00:00
Jingwen Chen
89b72a0e53 Merge "bp2build: genrule converter only supports "genrule"." am: c5a0089ac4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1644566

Change-Id: If82930aca0126312e3e5a7fb5c59a2e5068b0ed7
2021-03-18 22:42:19 +00:00
Jingwen Chen
c5a0089ac4 Merge "bp2build: genrule converter only supports "genrule"." 2021-03-18 22:41:52 +00:00
Colin Cross
65bb7ab016 Merge changes Idcbe2046,I09616402,Ide2f1ed9 am: a5d09762a6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634808

Change-Id: I030c3e7d1218b06a9e3b05f3cf593b79cb910bd7
2021-03-18 22:38:29 +00:00
Tri Vo
27003f983a Merge "Remove "-C link-dead-code=y" flag" am: 0e3758caea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643983

Change-Id: I184b047a950e238fd2c29340b94603a653567496
2021-03-18 22:38:19 +00:00
Treehugger Robot
b355d10e16 Merge "Check for frameworks/base/Android.bp instead of frameworks/base" am: d19b824e7f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640629

Change-Id: I52236b97dbfe21c7a8f64e41290c0fae3bf1a2c1
2021-03-18 22:38:11 +00:00
Kousik Kumar
a5c5f83b7e Merge "Allowlist RBE_num_retries_if_mismatched variable" am: 47665870d7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642779

Change-Id: I8b673d6c169f537dcd738dd49d67688de07dc21a
2021-03-18 22:37:55 +00:00
Paul Duffin
6a64d60ec2 Merge "Convert android/packaging_test.go to test fixtures" am: 813bfcb252
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1645098

Change-Id: I656567ac9b750e1c37488abe92a8f20b68db0606
2021-03-18 22:37:14 +00:00
Jingwen Chen
c7846f38fa bp2build: cc_library_headers converter should only include that module type
Test: bp2build; bazel build //bionic/...
Change-Id: I34768b51098c5b801e7c6d9b3a95ec0f37c3bb09
2021-03-18 18:35:39 -04:00
Colin Cross
a5d09762a6 Merge changes Idcbe2046,I09616402,Ide2f1ed9
* changes:
  Fix sbox in chdir mode
  Check RuleBuilder temporaries for path errors
  Fix WriteFileRule escaping
2021-03-18 22:28:11 +00:00
Paul Duffin
2101267467 Merge changes Iccba8caf,I1eb49f25,Id77575f8,I5679cb51,I7f9f3eb6, ... am: 387f4ce1ee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1645097

Change-Id: I45beb8a53b34b1b81609e8e1be7f05158726d339
2021-03-18 22:25:54 +00:00
Paul Duffin
dd9e5e311e Merge changes I2e69e7b5,I3c9c36e7 am: 000ae662fa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643947

Change-Id: I5e91be7a5b055ae866061b691d85266c4a411652
2021-03-18 22:12:00 +00:00
Tri Vo
0e3758caea Merge "Remove "-C link-dead-code=y" flag" 2021-03-18 21:27:54 +00:00
Treehugger Robot
d19b824e7f Merge "Check for frameworks/base/Android.bp instead of frameworks/base" 2021-03-18 20:56:54 +00:00
Kousik Kumar
47665870d7 Merge "Allowlist RBE_num_retries_if_mismatched variable" 2021-03-18 19:13:29 +00:00
Paul Duffin
813bfcb252 Merge "Convert android/packaging_test.go to test fixtures" 2021-03-18 18:38:34 +00:00
Paul Duffin
9c701fe72a Merge "Migrate sdk package to a per test build directory" am: ebcb37bab1 am: 4c34f52e06
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643950

Change-Id: Ie74fbcd0aea55c4369ac0b18abaf250ea0d42816
2021-03-18 18:20:01 +00:00
Paul Duffin
b7878471b6 Merge "Clean up java package use of python build components" am: c3f89bece1 am: a3a8cabb64
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643945

Change-Id: I979297cc28aee70c723c18b70630474e4ead4d13
2021-03-18 18:19:55 +00:00
Paul Duffin
22f6e418d9 Merge "Convert python package to fixtures" am: e410711cd5 am: c3c44b7b85
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643944

Change-Id: Ia965119d4f8f55ce1b2e344ee5210ccdc583c95d
2021-03-18 18:19:49 +00:00
Paul Duffin
387f4ce1ee Merge changes Iccba8caf,I1eb49f25,Id77575f8,I5679cb51,I7f9f3eb6, ...
* changes:
  Convert android/ninja_deps_test.go to test fixtures
  Add NinjaDeps to TestResult
  Convert android/singleton_module_test.go to test fixtures
  Convert android/neverallow_test.go to test fixtures
  Convert android/singleton_module_test.go to test fixtures
  Convert android/variable_test.go to test fixtures
  Convert android/soong_config_modules_test.go to test fixtures
  Convert android/mutator_test.go to test fixtures
  Convert android/deptag_test.go to test fixtures
2021-03-18 18:18:38 +00:00
Paul Duffin
000ae662fa Merge changes I2e69e7b5,I3c9c36e7
* changes:
  Convert sysprop package to fixtures
  Add preparers for sysprop
2021-03-18 18:17:20 +00:00
Paul Duffin
4c34f52e06 Merge "Migrate sdk package to a per test build directory" am: ebcb37bab1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643950

Change-Id: I8af396391f8111c377b7325dda1233538e91d200
2021-03-18 17:42:22 +00:00
Paul Duffin
a3a8cabb64 Merge "Clean up java package use of python build components" am: c3f89bece1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643945

Change-Id: Ica3d712304bf3d945ac9c134aacd7273aaa13a71
2021-03-18 17:42:12 +00:00
Paul Duffin
c3c44b7b85 Merge "Convert python package to fixtures" am: e410711cd5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643944

Change-Id: I4444dd8c482aad6c38e2d6353b6be772fbfbd59c
2021-03-18 17:41:21 +00:00
Paul Duffin
ebcb37bab1 Merge "Migrate sdk package to a per test build directory" 2021-03-18 17:05:11 +00:00
Paul Duffin
c3f89bece1 Merge "Clean up java package use of python build components" 2021-03-18 17:02:44 +00:00
Paul Duffin
e410711cd5 Merge "Convert python package to fixtures" 2021-03-18 17:02:19 +00:00
Paul Duffin
351ae039aa Merge "Prevent ApexInfoMutator from creating unnecessary variants" am: b72dd403de am: 03cf98057f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642102

Change-Id: I395372d6b1088789330644214d8aec41a8a6370a
2021-03-18 16:30:14 +00:00
Paul Duffin
03cf98057f Merge "Prevent ApexInfoMutator from creating unnecessary variants" am: b72dd403de
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642102

Change-Id: Ibe41f734d4983e7da974cb3c46ddd697a8308d14
2021-03-18 15:49:49 +00:00
Paul Duffin
3c5a83b056 Merge changes I9aad3e4e,I150889a0 am: b01125f92b am: c899e88474
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643949

Change-Id: I1665db9f07d604e520305971a1bc81b20f060b96
2021-03-18 15:29:27 +00:00
Paul Duffin
b72dd403de Merge "Prevent ApexInfoMutator from creating unnecessary variants" 2021-03-18 15:13:39 +00:00
Paul Duffin
c899e88474 Merge changes I9aad3e4e,I150889a0 am: b01125f92b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643949

Change-Id: I9db02b2be30cf5be39850bfe657b42304ba54b27
2021-03-18 14:48:12 +00:00
Paul Duffin
b01125f92b Merge changes I9aad3e4e,I150889a0
* changes:
  Convert xml package to fixtures
  Add preparers for xml
2021-03-18 14:16:31 +00:00
Paul Duffin
8185bd8586 Merge "Add prebuilt_platform_compat_config" am: d5065cfc66 am: c5b7854036
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642109

Change-Id: I85be48a0c65bc9caa2e2d4b7063ac41ec2581b6c
2021-03-18 13:12:21 +00:00
Paul Duffin
a2f599ce8a Merge "Convert android/namespace_test.go to test fixtures" am: 4b9bb5c057 am: 3d7a4af9e4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1641399

Change-Id: Ifbed2d7fa67f6b6340a95fc8db354ab4ac7f1c89
2021-03-18 13:12:16 +00:00
Paul Duffin
0a77010254 Merge "Add FixtureIgnoreErrors" am: cb460c91f1 am: 40a2e4ba4d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640338

Change-Id: I0f0edf580173800ff69151d8638119b958a4f055
2021-03-18 13:12:10 +00:00
Paul Duffin
47e55bcb7c Merge "Convert android/rule_builder_test.go to test fixtures" am: 50eb3829f9 am: 973956dba9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640337

Change-Id: Ibfa462cba444a668179ab13581b24d4db1b58c68
2021-03-18 13:11:40 +00:00
Paul Duffin
c5b7854036 Merge "Add prebuilt_platform_compat_config" am: d5065cfc66
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642109

Change-Id: I13a379afd6596d4dbba95e21b35fb29b3d77a0ac
2021-03-18 12:37:19 +00:00
Paul Duffin
3d7a4af9e4 Merge "Convert android/namespace_test.go to test fixtures" am: 4b9bb5c057
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1641399

Change-Id: I48a641ba34d7a3232289de22501308d28c3b3c83
2021-03-18 12:37:11 +00:00
Paul Duffin
40a2e4ba4d Merge "Add FixtureIgnoreErrors" am: cb460c91f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640338

Change-Id: Idfcad6a994bae3012705fea83d8749f2ef8db7ab
2021-03-18 12:37:00 +00:00
Paul Duffin
973956dba9 Merge "Convert android/rule_builder_test.go to test fixtures" am: 50eb3829f9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640337

Change-Id: I6459ad88c50bca1ae50e2eadb0d2a7b3afa8d634
2021-03-18 12:36:08 +00:00
Paul Duffin
d5065cfc66 Merge "Add prebuilt_platform_compat_config" 2021-03-18 12:28:00 +00:00
Paul Duffin
1afa515929 Migrate android package to a per test build directory
Bug: 182885307
Test: m nothing
Change-Id: I6b868bacc36be1f6768fbb2fb1d7ed4ad6e4118c
2021-03-18 12:18:09 +00:00
Paul Duffin
c3bdd310bd Convert android/packaging_test.go to test fixtures
Bug: 182885307
Test: m nothing
Change-Id: Ic2384bfe3f1edb8d252053fda7df66d49c46fd0f
2021-03-18 12:18:09 +00:00
Paul Duffin
d9ec7d2694 Convert android/ninja_deps_test.go to test fixtures
Bug: 182885307
Test: m nothing
Change-Id: Iccba8caffc7e5a82ff13d93a032edcf3f748fc40
2021-03-18 12:18:09 +00:00
Paul Duffin
d518b7e2f2 Convert android/path_properties_test.go to test fixtures
Bug: 182885307
Test: m nothing
Change-Id: If75f471885b5e4022b406e267e04b7a20e0be080
2021-03-18 12:18:09 +00:00
Paul Duffin
78c36216a8 Add NinjaDeps to TestResult
Bug: 182885307
Test: m nothing
Change-Id: I1eb49f2514b13f52f367cd8f57e5cb0ab3336bd7
2021-03-18 12:18:09 +00:00
Paul Duffin
a9237b6eeb Convert android/singleton_module_test.go to test fixtures
Bug: 182885307
Test: m nothing
Change-Id: Id77575f8ceda43545e2fad97fa1bd6b612c967b4
2021-03-18 12:18:09 +00:00
Paul Duffin
3c6a4ea24a Convert android/neverallow_test.go to test fixtures
Bug: 182885307
Test: m nothing
Change-Id: I5679cb517151ceaf468f2fe2e0ccab718cc7b4a3
2021-03-18 12:18:09 +00:00