Treehugger Robot
ae2eebd8be
Merge "emulator: use 5.4 for sdk_phone_arm64" am: 9fe3e4f5b2 am: db1c1eee8f
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1494658
Change-Id: I34f9927fe473a093f8fae27c9bbed48744a08435
2020-11-10 23:51:05 +00:00
Treehugger Robot
db1c1eee8f
Merge "emulator: use 5.4 for sdk_phone_arm64" am: 9fe3e4f5b2
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1494658
Change-Id: I508e270379b44d583d79f59ebab3750fe522fdaa
2020-11-10 23:15:27 +00:00
Treehugger Robot
9fe3e4f5b2
Merge "emulator: use 5.4 for sdk_phone_arm64"
2020-11-10 22:57:03 +00:00
bohu
88ccdd300e
emulator: use 5.4 for sdk_phone_arm64
...
4.4 is too old for S. x86 and x86_64
have already switched to 5.4
BUG: 169343095
Change-Id: I8ffc8af22f4be81f99ee9a2a5be42089ada4926c
2020-11-10 20:40:34 +00:00
Anton Hansson
3e998cedbc
Merge "Re-submit "Make sdk depend on merged srcjar instead of monolith"" am: 2686ccd91a am: b85906517b am: a20cfcbae3
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1492878
Change-Id: I159a4d26d9386d7e9fa1471297132c78245afce8
2020-11-10 14:40:25 +00:00
Anton Hansson
a20cfcbae3
Merge "Re-submit "Make sdk depend on merged srcjar instead of monolith"" am: 2686ccd91a am: b85906517b
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1492878
Change-Id: I5ee6b3bd3ece62697bcaa6d0938aefde36fd9efc
2020-11-10 14:03:26 +00:00
Anton Hansson
b85906517b
Merge "Re-submit "Make sdk depend on merged srcjar instead of monolith"" am: 2686ccd91a
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1492878
Change-Id: Ib6046355cf4639b432c5149eeb220f0b792afeac
2020-11-10 13:50:22 +00:00
Anton Hansson
2686ccd91a
Merge "Re-submit "Make sdk depend on merged srcjar instead of monolith""
2020-11-10 13:35:35 +00:00
Anton Hansson
1ed8eb8372
Re-submit "Make sdk depend on merged srcjar instead of monolith"
...
Bug: 158465496
Test: lunch sdk_phone_armv7; m sdk
Change-Id: I204ff3cc043dbc6d2a5383f87a067fc82caee3db
Merged-In: I204ff3cc043dbc6d2a5383f87a067fc82caee3db
2020-11-10 08:02:58 +00:00
Colin Cross
3d69a2a8f6
Merge "Revert "Make sdk depend on merged srcjar instead of monolith"" am: 56c15a5e02 am: 908089e9a0 am: 5fb00b3c80
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1490698
Change-Id: Id2dfc04bed0b8420eb9b882e83492087b9642fa6
2020-11-06 22:53:11 +00:00
Colin Cross
5fb00b3c80
Merge "Revert "Make sdk depend on merged srcjar instead of monolith"" am: 56c15a5e02 am: 908089e9a0
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1490698
Change-Id: I0126b9f12df21f63f800e21953b5991004e1bad7
2020-11-06 21:00:00 +00:00
Colin Cross
908089e9a0
Merge "Revert "Make sdk depend on merged srcjar instead of monolith"" am: 56c15a5e02
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1490698
Change-Id: Ic44462483265f74772fcae572036adc20ef37d77
2020-11-06 19:40:36 +00:00
Colin Cross
56c15a5e02
Merge "Revert "Make sdk depend on merged srcjar instead of monolith""
2020-11-06 19:28:34 +00:00
Colin Cross
7ee9fed293
Revert "Make sdk depend on merged srcjar instead of monolith"
...
This reverts commit 11e2f2ad76 .
Reason for revert: b/172663078
Bug: 169034951
Bug: 172663078
Change-Id: If8d432b621d5265d3cec4614ba33439ef5cc75a1
2020-11-06 19:27:22 +00:00
Anton Hansson
b24684d2c0
Merge "Make sdk depend on merged srcjar instead of monolith" am: a368dc8c05 am: 442f44b125 am: ae2ddf04aa
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1489277
Change-Id: I6129238aec45f9ef479aefba34c24c39c7d90a78
2020-11-06 16:30:10 +00:00
Anton Hansson
ae2ddf04aa
Merge "Make sdk depend on merged srcjar instead of monolith" am: a368dc8c05 am: 442f44b125
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1489277
Change-Id: I1bb4e3a09927f29ac7b435f5a96b85e5366413fa
2020-11-06 16:09:48 +00:00
Anton Hansson
442f44b125
Merge "Make sdk depend on merged srcjar instead of monolith" am: a368dc8c05
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1489277
Change-Id: I04b1eb672b5f0c6afc277094ce431b4378b297f1
2020-11-06 15:32:51 +00:00
Anton Hansson
a368dc8c05
Merge "Make sdk depend on merged srcjar instead of monolith"
2020-11-06 14:55:18 +00:00
Treehugger Robot
2ab6f2d05e
Merge "Phase out Legacy GSI" am: 5561cc8c1d am: 8340cd335a am: 0b316b32a3
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1485836
Change-Id: Ibef504b4965fccca8796e1cb7f5ce8749c444a95
2020-11-06 05:25:25 +00:00
Treehugger Robot
0b316b32a3
Merge "Phase out Legacy GSI" am: 5561cc8c1d am: 8340cd335a
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1485836
Change-Id: I6d500791586c98e68ef1e87dd1215570774e8164
2020-11-06 04:37:57 +00:00
Treehugger Robot
8340cd335a
Merge "Phase out Legacy GSI" am: 5561cc8c1d
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1485836
Change-Id: I21f671cd707061daa3460e21be1841f368fb95ac
2020-11-06 04:19:30 +00:00
Treehugger Robot
5561cc8c1d
Merge "Phase out Legacy GSI"
2020-11-06 04:00:40 +00:00
Anton Hansson
11e2f2ad76
Make sdk depend on merged srcjar instead of monolith
...
Bug: 158465496
Test: lunch sdk_phone_armv7; m sdk
Change-Id: I47b37223a05b9d396c97c3a86d76855b834f7f4a
2020-11-05 21:09:44 +00:00
Treehugger Robot
c55021409f
Merge "cargo2android: reorder TEST_MAPPING statements" am: 7534ce72da am: 623dc24c71 am: 4031a0990f
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1488686
Change-Id: I056b0757490720238b1748c5f8a67c088daac8d8
2020-11-05 20:37:03 +00:00
Treehugger Robot
4031a0990f
Merge "cargo2android: reorder TEST_MAPPING statements" am: 7534ce72da am: 623dc24c71
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1488686
Change-Id: I5b8fe1b7c09a88487d8e28c5cf12bbe797a782aa
2020-11-05 20:17:27 +00:00
Treehugger Robot
623dc24c71
Merge "cargo2android: reorder TEST_MAPPING statements" am: 7534ce72da
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1488686
Change-Id: I39a2baccb693fc7dfa4201e8c7e07c81bbc4c0b8
2020-11-05 19:50:32 +00:00
Treehugger Robot
7534ce72da
Merge "cargo2android: reorder TEST_MAPPING statements"
2020-11-05 19:16:05 +00:00
Jeff Vander Stoep
d11be480f3
cargo2android: reorder TEST_MAPPING statements
...
"host: true" entry should go before "name:" to match the output of
json writers which sort by alphabetical order. This will help and
avoid unnecesary changes when adding new tests to TEST_MAPPING - e.g.
aosp/1488728
Bug: 168167373
Test: cargo2android.py --run --tests
verify output
Change-Id: Id346a7f8a2cd910115e7fcc448c589363209bee9
2020-11-05 16:13:36 +01:00
Chih-hung Hsieh
d94a14dfbe
Merge "Give a warning to use --copy-out" am: ca84c4bb2f am: f1970ff373 am: 3f0e12a85f
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1486487
Change-Id: I8c91836bb0617c88fc8a24ad2bf58f9b4cd5fcf2
2020-11-05 01:31:13 +00:00
Chih-hung Hsieh
3f0e12a85f
Merge "Give a warning to use --copy-out" am: ca84c4bb2f am: f1970ff373
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1486487
Change-Id: If6a1cfdac0cb6cf723bb7fb5a5e4c2cfc4a5a80a
2020-11-05 01:15:46 +00:00
Chih-hung Hsieh
f1970ff373
Merge "Give a warning to use --copy-out" am: ca84c4bb2f
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1486487
Change-Id: Ib52aba9d1ca31d22f2450c5811e4b18e8dbbe336
2020-11-05 00:42:40 +00:00
Chih-hung Hsieh
ca84c4bb2f
Merge "Give a warning to use --copy-out"
2020-11-04 23:14:58 +00:00
Treehugger Robot
396651738e
Merge "Stop generating dumps for 32-bit binder" am: bfedfc2ade am: a925541695 am: b3a9e5e3a5
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1485805
Change-Id: I2ea9e8f7e06482b36e1853bed55910aa927a8ef5
2020-11-04 13:00:49 +00:00
Treehugger Robot
b3a9e5e3a5
Merge "Stop generating dumps for 32-bit binder" am: bfedfc2ade am: a925541695
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1485805
Change-Id: I44c2eda6d73547b65a6be5953f73b4ea75c8cfcc
2020-11-04 12:46:09 +00:00
Treehugger Robot
a925541695
Merge "Stop generating dumps for 32-bit binder" am: bfedfc2ade
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1485805
Change-Id: I20c29c723cba723435ce3587734fe3ae32b41f0e
2020-11-04 12:24:27 +00:00
Treehugger Robot
bfedfc2ade
Merge "Stop generating dumps for 32-bit binder"
2020-11-04 12:07:19 +00:00
Hsin-Yi Chen
90037c7852
Stop generating dumps for 32-bit binder
...
Test: ./create_reference_dumps.py -l libc
Bug: 162277261
Change-Id: I07d74ca750c5116f41267aca48b9cc41324404ae
2020-11-04 16:33:53 +08:00
android-build-team Robot
96a98a1d50
Merge cherrypicks of [12982162, 12984235, 12984148, 12984149] into rvc-qpr1-release
...
Change-Id: Idd5e332200277408c505e08f5b9ec6932f32b9b7
2020-11-04 04:03:11 +00:00
Neha Jain
32aada6f9f
Updating build-tools package revision number to ship a hot fix for b/169193089
...
Bug: 169193089
Change-Id: I025c0d96e77b7355baddac935779c6b27f3042e3
Test: N/A
(cherry picked from commit 81daa26558 )
2020-11-04 04:00:41 +00:00
android-build-team Robot
ead17633d8
Snap for 6949869 from ed2551e374 to rvc-qpr2-release
...
Change-Id: If76cadf3877a60e1dfb825c3aaf9585fa07cdba6
2020-11-04 00:02:37 +00:00
Chih-Hung Hsieh
60140756b8
Give a warning to use --copy-out
...
* Suggest --copy-out if it is not used, cargo output files are found,
and env!("CARGO_OUT") is found in .rs files.
* Expect to see this warning for libsqlite3-sys and grpcio-sys,
which fit to the use case of --copy-out but they have locally
defined .bp files and non-original output files.
* Fix one pylint warning of extra long line.
Bug: 172299436
Test: run cargo with same flags for all rust/crates/*
Test: run cargo without --copy-out for anyhow, protobuf, clang-sys, etc.
Change-Id: Ic346c8e1146b1bb77e63c4cb12947f202b0f458e
2020-11-03 15:51:52 -08:00
SzuWei Lin
75edc0984f
Phase out Legacy GSI
...
Bug: 162277261
Test: none
Change-Id: I81f84ea959bfa2155d734a582e7b7170ded9c4f6
2020-11-03 18:28:54 +08:00
Chih-hung Hsieh
24838d8627
Merge "Add --patch and --ignore-cargo-errors options" am: 87b2d90748 am: dfa38d0e80 am: 29b38022fe
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1483304
Change-Id: Ie9132e4692e788b5b7ab68e89c702861285889f4
2020-11-03 05:50:04 +00:00
Chih-hung Hsieh
29b38022fe
Merge "Add --patch and --ignore-cargo-errors options" am: 87b2d90748 am: dfa38d0e80
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1483304
Change-Id: I083850f0d5f7912d721fde649020349117edd74c
2020-11-03 05:38:21 +00:00
Chih-hung Hsieh
dfa38d0e80
Merge "Add --patch and --ignore-cargo-errors options" am: 87b2d90748
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1483304
Change-Id: Icc379ab7ea290072fcae31da8aa944f4b24f36b4
2020-11-03 05:25:14 +00:00
Chih-hung Hsieh
87b2d90748
Merge "Add --patch and --ignore-cargo-errors options"
2020-11-03 05:00:00 +00:00
Chih-hung Hsieh
9fd19c23d1
Merge "Do not use Cargo.lock during cargo build." am: 73c7e65403 am: 75c2b4d05e am: bdf69822a9
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1480746
Change-Id: I4f1a2b13d0508fe3b94d519ce0f7966fa9770360
2020-11-02 23:19:15 +00:00
Neha Jain
c5c51cd8c2
Updating build-tools package revision number to ship a hot fix for b/169193089 am: 81daa26558 am: 76b00edfa0 am: e6356b75e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12968794
Change-Id: I077e223c585d0995ea78f465066ba882943b8967
2020-11-02 23:18:33 +00:00
Neha Jain
c20cf40b21
Updating build-tools package revision number to ship a hot fix for b/169193089 am: 81daa26558 am: 76b00edfa0 am: ed2551e374
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12968794
Change-Id: I7addcb4de730c47ca954045e9ae4abe56c41eda1
2020-11-02 23:17:38 +00:00
Chih-hung Hsieh
bdf69822a9
Merge "Do not use Cargo.lock during cargo build." am: 73c7e65403 am: 75c2b4d05e
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1480746
Change-Id: Id9faf1df23e45dbce9c08d490a86b02409621b30
2020-11-02 23:03:59 +00:00