Commit Graph

34708 Commits

Author SHA1 Message Date
Paul Duffin
bb1441b473 Merge "Remove javaMockFS()" am: 54a5e9a467
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634638

Change-Id: Ib8748d7d5fcb88e0650fdc295e90983c09969b44
2021-03-19 15:04:18 +00:00
Paul Duffin
54a5e9a467 Merge "Remove javaMockFS()" 2021-03-19 14:18:46 +00:00
Paul Duffin
9f05456008 Merge "Fix TestTurbine to work without javaMockFS()" am: 89fbdb2387
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634637

Change-Id: I97d73dd2c36886fe6982a31266d5c999bf3614f4
2021-03-19 11:27:54 +00:00
Paul Duffin
a5807d2dfb Merge "Fix testDexpreoptBoot to work without javaMockFS()" am: 64df56def9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634636

Change-Id: I6e2ea6cce1643bdb51c74b5eed871fbbdd104ee0
2021-03-19 11:27:43 +00:00
Paul Duffin
e9cbe547f1 Merge "Fix TestClasspath to work without javaMockFS()" am: 750f8f3515
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634635

Change-Id: I2d5c352c8df9e5c6dc83f7d28adffac1d5823cdc
2021-03-19 11:27:25 +00:00
Paul Duffin
d5e47f1edb Merge "Convert TestClasspath to test fixtures" am: 903a8a08ab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634634

Change-Id: Id534df47dd13b365247d63e358e05f6bca9fc4bf
2021-03-19 11:26:11 +00:00
Paul Duffin
89fbdb2387 Merge "Fix TestTurbine to work without javaMockFS()" 2021-03-19 11:11:42 +00:00
Paul Duffin
64df56def9 Merge "Fix testDexpreoptBoot to work without javaMockFS()" 2021-03-19 11:09:21 +00:00
Paul Duffin
750f8f3515 Merge "Fix TestClasspath to work without javaMockFS()" 2021-03-19 11:08:35 +00:00
Paul Duffin
903a8a08ab Merge "Convert TestClasspath to test fixtures" 2021-03-19 11:08:17 +00:00
Jingwen Chen
5d622ec767 Merge "bp2build: cc_library_headers converter should only include that module type" am: b1672af5d2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1645006

Change-Id: I3b7b057acc4ad90393669b89f56118635c258c36
2021-03-19 09:58:37 +00:00
Jingwen Chen
b1672af5d2 Merge "bp2build: cc_library_headers converter should only include that module type" 2021-03-19 09:18:15 +00:00
Inseob Kim
d76ad94973 Merge "Add sepolicy related variables" am: fc8e9c7f00
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1641780

Change-Id: Ic5911a7ee516f6ecef60955fdfe7d65d0bbbc47d
2021-03-19 00:30:48 +00:00
Justin Yun
2d0020dbbd Merge "Define __ANDROID_VENDOR__ and __ANDROID_PRODUCT__" am: b1d5479783
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620648

Change-Id: I63f27b734085f8fffb4d43cbcf501c1ea25c8d01
2021-03-19 00:29:52 +00:00
Inseob Kim
fc8e9c7f00 Merge "Add sepolicy related variables" 2021-03-19 00:07:58 +00:00
Justin Yun
b1d5479783 Merge "Define __ANDROID_VENDOR__ and __ANDROID_PRODUCT__" 2021-03-18 23:33:43 +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
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
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
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
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
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