Commit graph

48725 commits

Author SHA1 Message Date
Elliott Hughes
5be86fe976 Merge "Add test_suites to libutils_test." am: bc94667e8e am: 2eca1f4bf0
am: 1bf8a30696

Change-Id: Ic6448639d8079c6f1b67b8a0d6130663ce57b864
2019-02-26 14:54:47 -08:00
Elliott Hughes
1bf8a30696 Merge "Add test_suites to libutils_test." am: bc94667e8e
am: 2eca1f4bf0

Change-Id: Ie4bf24cc5fcc23f51d83c7b2ae8ea911a8bf411a
2019-02-26 14:48:25 -08:00
Elliott Hughes
2eca1f4bf0 Merge "Add test_suites to libutils_test."
am: bc94667e8e

Change-Id: I7cff1afd6f7b2a4b3572917fd3cdb3b63e4834e3
2019-02-26 14:43:08 -08:00
Josh Gao
7975e1812d Merge "Revert "adbd: switch the default USB implementation."" am: c2970282cb am: b7d775866c
am: 093d5c34a5

Change-Id: I70c93faf116d9acdaf9852d286ecc64e87ecc05c
2019-02-26 14:39:12 -08:00
Elliott Hughes
bc94667e8e Merge "Add test_suites to libutils_test." 2019-02-26 22:31:26 +00:00
Josh Gao
093d5c34a5 Merge "Revert "adbd: switch the default USB implementation."" am: c2970282cb
am: b7d775866c

Change-Id: Idf5e30a236b394fcae7072e3f10a171dc549fb86
2019-02-26 14:29:36 -08:00
Josh Gao
b7d775866c Merge "Revert "adbd: switch the default USB implementation.""
am: c2970282cb

Change-Id: I55b9fa99642980d229623b0b1231b448b79f97b6
2019-02-26 14:21:23 -08:00
Josh Gao
c2970282cb Merge "Revert "adbd: switch the default USB implementation."" 2019-02-26 22:15:40 +00:00
Josh Gao
0d780391a1 Revert "adbd: switch the default USB implementation."
This reverts commit 12f328489b.

Reason for revert: possibly causing b/126388431

Change-Id: Ida7c30a92f552f923f3bcb153d945d58ebbc4257
2019-02-26 22:10:33 +00:00
Josh Gao
0537179493 Merge changes I86c3ec0f,I57d1a30a,Ib50d289b,I791a4f82,I316a8799, ... am: 216d158daf am: ff7b56f917
am: d575bc93a5

Change-Id: I610dd6851e7725c45fd64875eef758175fb19b0b
2019-02-26 13:30:18 -08:00
Josh Gao
d575bc93a5 Merge changes I86c3ec0f,I57d1a30a,Ib50d289b,I791a4f82,I316a8799, ... am: 216d158daf
am: ff7b56f917

Change-Id: I8dbbc43a2690cd35528dae59a3625c5288dc7a64
2019-02-26 13:21:03 -08:00
Nicolas Geoffray
5af7e33f5c Merge "Add a DEX2OAT_BOOTCLASSPATH variable." am: 1706eb08fe am: e25fa6da1b
am: f2472a1d72

Change-Id: I87229520c03855fac9d56fcd98f20a19ac5061e2
2019-02-26 13:19:14 -08:00
Josh Gao
ff7b56f917 Merge changes I86c3ec0f,I57d1a30a,Ib50d289b,I791a4f82,I316a8799, ...
am: 216d158daf

Change-Id: I44e6f7071425d4d4e627d336a7ba07b5314a2643
2019-02-26 13:13:07 -08:00
Nicolas Geoffray
f2472a1d72 Merge "Add a DEX2OAT_BOOTCLASSPATH variable." am: 1706eb08fe
am: e25fa6da1b

Change-Id: Iac2edb56374e571a3a741edfa9279a82a63f50f8
2019-02-26 13:10:39 -08:00
Nicolas Geoffray
e25fa6da1b Merge "Add a DEX2OAT_BOOTCLASSPATH variable."
am: 1706eb08fe

Change-Id: I99097127c5742c2184366a061cf5e69648f53a29
2019-02-26 13:02:04 -08:00
Josh Gao
216d158daf Merge changes I86c3ec0f,I57d1a30a,Ib50d289b,I791a4f82,I316a8799, ...
* changes:
  adb: switch sockets.cpp to ConsumePrefix.
  adbd: switch abb to ConsumePrefix.
  adb: increment server version.
  adb: wait for device to disconnect upon `adb root`.
  adb: implement wait-for-disconnect.
  adb: tell the client what transport it received.
  adbd: switch daemon/services to ConsumePrefix.
  adb: switch host_service_to_socket to string_view.
  adb: switch handle_host_request to string_view.
  adb: switch adb_io.h to string_view.
  adb: add helper to consume a prefix on a string_view.
  adb: make ParseUint reject garbage at the end by default.
2019-02-26 20:55:19 +00:00
Nicolas Geoffray
1706eb08fe Merge "Add a DEX2OAT_BOOTCLASSPATH variable." 2019-02-26 20:38:32 +00:00
David Anderson
fbb9d1e150 Merge "Allow fiemap_writer_test to run in arbitrary directories." am: e99564fc62 am: 58fc986bd1
am: 9fb4aaa1a7

Change-Id: I8bd5614d3f35867308f49451a84c63ce0315b6ac
2019-02-26 12:07:00 -08:00
David Anderson
9fb4aaa1a7 Merge "Allow fiemap_writer_test to run in arbitrary directories." am: e99564fc62
am: 58fc986bd1

Change-Id: I050833d59d58e6e545f5f97fce14735a40d08e2e
2019-02-26 11:49:32 -08:00
David Anderson
58fc986bd1 Merge "Allow fiemap_writer_test to run in arbitrary directories."
am: e99564fc62

Change-Id: I90dd03e7a6e6a6916c2b3d1d1866a944cc097345
2019-02-26 11:46:24 -08:00
David Anderson
e99564fc62 Merge "Allow fiemap_writer_test to run in arbitrary directories." 2019-02-26 19:33:36 +00:00
Martin Stjernholm
7c4b14fae3 Merge "Fix libdexfile dependencies to avoid direct dependency on libdexfile_external." am: 21c29cfade am: e6ab117292
am: bc43c7c05d

Change-Id: Iff52585c320e81883514b10753af095c3e434259
2019-02-26 09:39:04 -08:00
Martin Stjernholm
bc43c7c05d Merge "Fix libdexfile dependencies to avoid direct dependency on libdexfile_external." am: 21c29cfade
am: e6ab117292

Change-Id: I564f0e3a18a9b6f0842303fdc6ce8ea76277e3c5
2019-02-26 09:34:52 -08:00
Martin Stjernholm
e6ab117292 Merge "Fix libdexfile dependencies to avoid direct dependency on libdexfile_external."
am: 21c29cfade

Change-Id: I1526f70910aa0ecd49d303bc848a3d08e4aa7a76
2019-02-26 09:30:44 -08:00
Treehugger Robot
21c29cfade Merge "Fix libdexfile dependencies to avoid direct dependency on libdexfile_external." 2019-02-26 17:19:42 +00:00
Nicolas Geoffray
0c49d1759c Add a DEX2OAT_BOOTCLASSPATH variable.
Bug: 119800099
Test: m
Change-Id: I8ae4ecea6da2ef541736a38822b100a620d72a8a
2019-02-26 12:57:17 +00:00
Juju Sung
848d123db5 Merge "lmkd: Remove redundant free swap and free memory check" am: 89a7cc48cc am: ab0319ece8
am: e8cce305b4

Change-Id: Ie9ad61bcd4de78cf72b05b7075e526afaf4e1252
2019-02-26 04:19:40 -08:00
Juju Sung
e8cce305b4 Merge "lmkd: Remove redundant free swap and free memory check" am: 89a7cc48cc
am: ab0319ece8

Change-Id: I727d624f1149452ce755c0145f13a286f6422048
2019-02-26 02:54:06 -08:00
Juju Sung
ab0319ece8 Merge "lmkd: Remove redundant free swap and free memory check"
am: 89a7cc48cc

Change-Id: I905a1d573d2fa66588a4dd436f4d1bd4cdf009ff
2019-02-26 02:08:59 -08:00
Treehugger Robot
89a7cc48cc Merge "lmkd: Remove redundant free swap and free memory check" 2019-02-26 09:53:31 +00:00
Josh Gao
88c3bd5c83 Merge "adbd: switch the default USB implementation." am: 5782600271 am: 269ef5d068
am: d4c49c4b44

Change-Id: I85adc4e8d270a6c71dbd0266ba330df6c37b2faf
2019-02-26 01:21:38 -08:00
Josh Gao
d4c49c4b44 Merge "adbd: switch the default USB implementation." am: 5782600271
am: 269ef5d068

Change-Id: I479f1de000ad2c9732550e0dc78a23ece811ff16
2019-02-26 01:03:36 -08:00
Mark Salyzyn
be5ef66b47 Merge "fs_mgr: overlayfs: system as root can not detect shared blocks (taimen)" am: a24338bff8 am: 7880279ac6
am: b891c46282

Change-Id: Ib1e79c06a767abb45df976e9bc21366695c0fe62
2019-02-26 00:44:19 -08:00
Bowgo Tsai
38eb0976d0 Merge changes from topic "fs_mgr_unit_test" am: 6d6ccdf7c6 am: b45e01bdd3
am: 9dc08bd409

Change-Id: Iae86306d7f8a174d86b94ff8a15eb16764ddc991
2019-02-26 00:27:47 -08:00
Paul Trautrim
ced47c7acd Merge "fiemap_writer: Use fallocate64" am: 032b744809 am: 06df12ba3b
am: e0be5694c4

Change-Id: Icc2169ca1b7cb375cbf962467cc622fc726333ca
2019-02-26 00:23:46 -08:00
Mark Salyzyn
afb4f183f6 Merge "fs_mgr: overlayfs: test: Add --print-time option" am: 3be9bff517 am: d36d052a20
am: 4f9a05b878

Change-Id: Ia2e2028af753d8973479d82c923ea2c8d77dd08c
2019-02-26 00:18:18 -08:00
Mark Salyzyn
b891c46282 Merge "fs_mgr: overlayfs: system as root can not detect shared blocks (taimen)" am: a24338bff8
am: 7880279ac6

Change-Id: I3aaf4b4506432f5f0a3c82e053886b3e78e65c60
2019-02-26 00:15:32 -08:00
Josh Gao
269ef5d068 Merge "adbd: switch the default USB implementation."
am: 5782600271

Change-Id: Idbc6eba721e06bfa4659f2aac1592f6bdf84a9a5
2019-02-26 00:12:43 -08:00
Bowgo Tsai
9dc08bd409 Merge changes from topic "fs_mgr_unit_test" am: 6d6ccdf7c6
am: b45e01bdd3

Change-Id: Idc3b23df9b087b578e8904139aefd09a49fce84d
2019-02-25 23:54:32 -08:00
Paul Trautrim
e0be5694c4 Merge "fiemap_writer: Use fallocate64" am: 032b744809
am: 06df12ba3b

Change-Id: Ifc1c6e48c1320171632bc7dfe6679cb4006f3f6a
2019-02-25 23:45:25 -08:00
Mark Salyzyn
4f9a05b878 Merge "fs_mgr: overlayfs: test: Add --print-time option" am: 3be9bff517
am: d36d052a20

Change-Id: Ia6f7bdcfe562d0119c6ace5c7f453fc927417cbf
2019-02-25 23:28:43 -08:00
Mark Salyzyn
7880279ac6 Merge "fs_mgr: overlayfs: system as root can not detect shared blocks (taimen)"
am: a24338bff8

Change-Id: I14c0c136c362dff252ea7d1ffbff7a054e4686d9
2019-02-25 23:27:06 -08:00
Bowgo Tsai
b45e01bdd3 Merge changes from topic "fs_mgr_unit_test"
am: 6d6ccdf7c6

Change-Id: I5dbb8cc6871d76d0a8608ff4db368e5865686742
2019-02-25 23:20:47 -08:00
Neil Fuller
f54ccb8dd1 Merge "Move tzdatacheck execution after apex is mounted" am: 61b2016881 am: 3305192d3a
am: 6916a8fc05

Change-Id: Ibe63dfc1aa23b6626e98688d5d1d334d79bb85c8
2019-02-25 23:13:00 -08:00
Paul Trautrim
06df12ba3b Merge "fiemap_writer: Use fallocate64"
am: 032b744809

Change-Id: Icca45dde6e0e7e15eddb456da641167d1d401cd7
2019-02-25 23:12:59 -08:00
Mark Salyzyn
d36d052a20 Merge "fs_mgr: overlayfs: test: Add --print-time option"
am: 3be9bff517

Change-Id: I7026f55a132445115b078e19d3bac547c923fac8
2019-02-25 23:08:58 -08:00
Neil Fuller
6916a8fc05 Merge "Move tzdatacheck execution after apex is mounted" am: 61b2016881
am: 3305192d3a

Change-Id: Ibd10e2778c66dd7a4ff3d1139f5a783405d73941
2019-02-25 23:02:41 -08:00
Neil Fuller
3305192d3a Merge "Move tzdatacheck execution after apex is mounted"
am: 61b2016881

Change-Id: Ib8b0773a2abed59a7464a1eab034db394b9b2c53
2019-02-25 22:51:17 -08:00
Josh Gao
5782600271 Merge "adbd: switch the default USB implementation." 2019-02-26 06:47:46 +00:00
Treehugger Robot
a24338bff8 Merge "fs_mgr: overlayfs: system as root can not detect shared blocks (taimen)" 2019-02-26 05:34:32 +00:00