Brett Chabot
49183d3ec3
Migrate build/make to androidx.test
...
See go/jetpack-test-android-migration
Test: make checkbuild
Change-Id: If6a6b751c4a6ca837c3166688a0c93d2e923ee4c
2018-12-13 19:06:34 -08:00
Tianjie Xu
6d1fcd8553
Merge "blockimgdiff: Factor out the diff_worker" am: 8ab919dcce
am: 5437eeeb1c
...
am: ec7c8ac120
Change-Id: Ie891b59e51772eb6ea8093073b8f4969dd4d6db4
2018-12-13 14:27:19 -08:00
Xin Li
cd04ff6211
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: 93e6c59784
-s ours am: 4dd78f7af5
-s ours
...
am: 3aaead4c45
-s ours
Change-Id: I2343f8283036100d8f901fc5f36206ac17d172df
2018-12-13 14:15:19 -08:00
Xin Li
f8fffc491d
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 3449df5704
-s ours am: ff9ea058c6
-s ours
...
am: a830ca644f
-s ours
Change-Id: I9dcfaf1b81e3652a084041bd714fde4c1a55db53
2018-12-13 13:49:24 -08:00
Tianjie Xu
ec7c8ac120
Merge "blockimgdiff: Factor out the diff_worker" am: 8ab919dcce
...
am: 5437eeeb1c
Change-Id: Ibdad9aed6ef21b85b694bf10a168aead0ba37f1e
2018-12-13 12:44:49 -08:00
Xin Li
3aaead4c45
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: 93e6c59784
-s ours
...
am: 4dd78f7af5
-s ours
Change-Id: I287cfc41f61fb755771cf0d375267795542639f8
2018-12-13 12:36:48 -08:00
Tianjie Xu
5437eeeb1c
Merge "blockimgdiff: Factor out the diff_worker"
...
am: 8ab919dcce
Change-Id: I590dac85679de6209a3ba00052a309f41567cbae
2018-12-13 12:16:18 -08:00
Xin Li
a830ca644f
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 3449df5704
-s ours
...
am: ff9ea058c6
-s ours
Change-Id: I8757f0b303be30b7c6b15aa0b89e07f104f00c34
2018-12-13 12:12:25 -08:00
Xin Li
4dd78f7af5
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"
...
am: 93e6c59784
-s ours
Change-Id: I8b94a408dd874a2f78f1a9c8640a33935daa8ad8
2018-12-13 11:50:22 -08:00
Xin Li
ff9ea058c6
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
...
am: 3449df5704
-s ours
Change-Id: Ibf5ae0081885d8d8d6d6de24bbf978e881486774
2018-12-13 11:12:53 -08:00
Tianjie Xu
8ab919dcce
Merge "blockimgdiff: Factor out the diff_worker"
2018-12-13 18:45:30 +00:00
TreeHugger Robot
868c81ccc3
Merge "Relax inode usage estimation slack for DAP right sizing"
2018-12-13 08:55:37 +00:00
Treehugger Robot
93e6c59784
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"
2018-12-13 05:45:21 +00:00
Mathieu Chartier
9d484aaf1d
Merge "Change profman logging to only be for errors" am: 9fb09f1762
am: d468d072c7
...
am: 1f93f42804
Change-Id: Idd94141408a572fc30662105f740302fb4b7b8a8
2018-12-12 20:59:38 -08:00
Mathieu Chartier
1f93f42804
Merge "Change profman logging to only be for errors" am: 9fb09f1762
...
am: d468d072c7
Change-Id: Icdfc64568ea0a0e30fd388f8b1a16eb4ba2a4da3
2018-12-12 20:17:04 -08:00
Mathieu Chartier
d468d072c7
Merge "Change profman logging to only be for errors"
...
am: 9fb09f1762
Change-Id: Ib5d999332540333145c8de68e9a0bfdd1fa230be
2018-12-12 20:09:18 -08:00
Hridya Valsaraju
3e02e34090
Relax inode usage estimation slack for DAP right sizing
...
The current increase of 4 % is insufficient for some
targets.
Test: mmm
Bug: 119115481
Change-Id: Idcba8025b913da9b70794bfc7464d15b4d99ad34
2018-12-12 18:03:41 -08:00
Mathieu Chartier
9fb09f1762
Merge "Change profman logging to only be for errors"
2018-12-13 01:17:23 +00:00
xunchang
2153183acf
blockimgdiff: Factor out the diff_worker
...
We will call it at an earlier time to compute the patch size; and
choose the transfers to convert to 'new'.
Bug: 120561199
Test: Generate an incremental update on shiner
Change-Id: I29a0c8e75c9e5b66a266c1387186692a86fcbe43
2018-12-12 17:02:39 -08:00
Dongwon Kang
31adbe5143
Merge "Add com.android.media in the default build."
2018-12-13 00:53:00 +00:00
TreeHugger Robot
f017a4ac07
Merge "Add bufferhub service to system partition"
2018-12-12 22:30:55 +00:00
Mark Salyzyn
7dcdf4ae22
Merge "fs_config: remove empty fs_config_* automation." am: c8b3d5f92f
am: 10d6aab12c
...
am: 2db5e766e8
Change-Id: I1d8a817d61a76e0a997b8708a5b49d62ae197f5e
2018-12-12 14:00:14 -08:00
Mark Salyzyn
2db5e766e8
Merge "fs_config: remove empty fs_config_* automation." am: c8b3d5f92f
...
am: 10d6aab12c
Change-Id: I1cb553fa10db427f8dc41c88d43bcbd5c3fe5864
2018-12-12 13:51:02 -08:00
Mark Salyzyn
10d6aab12c
Merge "fs_config: remove empty fs_config_* automation."
...
am: c8b3d5f92f
Change-Id: If9a7d9cf176aab35e13311c941e5da8072cbbf8b
2018-12-12 13:46:57 -08:00
Treehugger Robot
c8b3d5f92f
Merge "fs_config: remove empty fs_config_* automation."
2018-12-12 21:27:15 +00:00
Mathieu Chartier
cc4ca50cfb
Change profman logging to only be for errors
...
Move profman logging to only be for errors. Avoids build spam.
Bug: 120907449
Test: make
Change-Id: I0707dc5c8d6516cbf95d263864bdddaf5a5990c9
2018-12-12 10:28:02 -08:00
Matt Pape
65d1857067
Merge "Add device_config module for debugging configuration flags."
2018-12-12 17:37:29 +00:00
Mark Salyzyn
640816eb42
fs_config: remove empty fs_config_* automation.
...
The code to manage citing empty <partition>/etc/fs_config_{files|dirs}
content by specifically setting the file(s) to access mode 00000 is
bitrotted and ill-suited for multiple partitions and was written for
a more paranoid time when DAC and MAC rules were not nearly as mature.
Striking out the complications as it affected deterministic results.
Test: compile and boot
Bug: 119310326
Change-Id: Iec02e0c1194eaa799ab95adff4ff0951a24652a4
2018-12-12 08:40:19 -08:00
Nicolas Geoffray
7d1af4610a
Merge "Remove perfprofd from set of binaries installed on system." am: 1e57a89bf9
am: 41136edafd
...
am: ef9d004894
Change-Id: Ibd867ed2c2ad84ba53487b1e4f203864df50d98e
2018-12-12 05:40:01 -08:00
Nicolas Geoffray
ef9d004894
Merge "Remove perfprofd from set of binaries installed on system." am: 1e57a89bf9
...
am: 41136edafd
Change-Id: I8e0f1acb17b37cda2ef0b080cffbd3b08a5565ff
2018-12-12 05:34:55 -08:00
Nicolas Geoffray
41136edafd
Merge "Remove perfprofd from set of binaries installed on system."
...
am: 1e57a89bf9
Change-Id: I0539202c7608fff7f206420adc1e560454ae9de8
2018-12-12 05:29:38 -08:00
Nicolas Geoffray
1e57a89bf9
Merge "Remove perfprofd from set of binaries installed on system."
2018-12-12 13:09:55 +00:00
Chen, ZhiminX
3befb5cdc6
Merge "Add recovery_acpio option to make recovery image" am: 53de7a71f6
am: 7961f460d7
...
am: 978911ab95
Change-Id: I3886db3c206da677e5219ea8de808618483bcf23
2018-12-12 00:48:56 -08:00
Chen, ZhiminX
978911ab95
Merge "Add recovery_acpio option to make recovery image" am: 53de7a71f6
...
am: 7961f460d7
Change-Id: Icbd5c8615436b641de9ab4a785ec15498d27e204
2018-12-12 00:39:46 -08:00
Chen, ZhiminX
7961f460d7
Merge "Add recovery_acpio option to make recovery image"
...
am: 53de7a71f6
Change-Id: Ie38327b84791652f8e0693c74854675f488ec645
2018-12-12 00:30:36 -08:00
Treehugger Robot
53de7a71f6
Merge "Add recovery_acpio option to make recovery image"
2018-12-12 08:13:46 +00:00
dimitry
f343d14efd
Merge "Rename _complete-android-module-names" am: 5e5cf8e17d
am: ca97eaef00
...
am: 517ba66e64
Change-Id: Iad1e2fda5fb61030d91e013b08b807a16fdb5fca
2018-12-11 16:20:05 -08:00
dimitry
517ba66e64
Merge "Rename _complete-android-module-names" am: 5e5cf8e17d
...
am: ca97eaef00
Change-Id: Id877ef281ded08223c85a31973bbe799037fb02d
2018-12-11 16:09:13 -08:00
Xin Li
ef825bfb14
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master am: f904d0f74e
-s ours
...
am: f6eecdeede
-s ours
Change-Id: I1f1fb3b2cad5b2d0e0fb257f264d048c04d07211
2018-12-11 16:06:40 -08:00
Xin Li
f6eecdeede
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master
...
am: f904d0f74e
-s ours
Change-Id: I14086ab98220ca35e134c6c5eea9877839adf21d
2018-12-11 15:32:13 -08:00
Xin Li
41010fc666
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master am: ffef19fc52
-s ours
...
am: 499402674e
-s ours
Change-Id: Iea48db3b45612970b4dcccae59a5dd73cbb57de4
2018-12-11 15:29:12 -08:00
Nicolas Geoffray
1bc5aff793
Remove perfprofd from set of binaries installed on system.
...
Needed to get some space on marlin-eng :(
Also avoids static linking libart into perfprofd. Roland will follow-up by reverting the no-perfprofd changes.
bug: 73175642
Test: lunch marlin-eng && m -j32
Change-Id: Ic1c79c6dd1052981801b92604f9891a8a63b4ea0
2018-12-11 23:00:57 +00:00
Xin Li
499402674e
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
...
am: ffef19fc52
-s ours
Change-Id: I8adfe38c7958faadc63a11a1e8d124b4989e8b35
2018-12-11 15:00:32 -08:00
dimitry
ca97eaef00
Merge "Rename _complete-android-module-names"
...
am: 5e5cf8e17d
Change-Id: Iea29c9492fb25543887eadf75f01ca07ea736d62
2018-12-11 14:30:46 -08:00
Xin Li
3449df5704
DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
...
Bug: 120502534
Change-Id: Ib1b590fc605b17e3a3901e65f62d5f7ad2257f6a
2018-12-11 14:03:11 -08:00
TreeHugger Robot
f904d0f74e
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master
2018-12-11 21:49:25 +00:00
Matt Pape
406427985d
Add device_config module for debugging configuration flags.
...
Test: check installed files on local builds.
Bug:109919982
Bug:113101834
Change-Id: Ie9ae3930f216efe932dcc6246bbf9cc6e3b8ff14
2018-12-11 21:16:27 +00:00
Treehugger Robot
5e5cf8e17d
Merge "Rename _complete-android-module-names"
2018-12-11 19:46:20 +00:00
Tianjie Xu
52655dab92
Merge "recovery text image: use zopflipng to compress the generated images" am: b38ae44d1e
am: b47bd0ff41
...
am: 829623607d
Change-Id: I1cbf9223472102ebcee7eae1f65a09765b6f4a73
2018-12-11 11:21:11 -08:00
Tianjie Xu
829623607d
Merge "recovery text image: use zopflipng to compress the generated images" am: b38ae44d1e
...
am: b47bd0ff41
Change-Id: Ic26fbab0b065956c8ae795d81640bfc605b292f8
2018-12-11 11:12:52 -08:00