Commit graph

26463 commits

Author SHA1 Message Date
Tao Bao
87cbd3aaf9 Merge "ziparchive: Allow ExtractEntryToFile() to work with block device." am: 787482ecd9 am: af2a8858c4
am: 9b1b0627b9

Change-Id: I9f18ea7b4ae15131a84c5db00ad078636d37215f
2016-11-15 22:26:48 +00:00
Tao Bao
9b1b0627b9 Merge "ziparchive: Allow ExtractEntryToFile() to work with block device." am: 787482ecd9
am: af2a8858c4

Change-Id: I2cc4cf5e95bb624b8cef6ebde3852fb975f7cbca
2016-11-15 22:18:49 +00:00
Tao Bao
af2a8858c4 Merge "ziparchive: Allow ExtractEntryToFile() to work with block device."
am: 787482ecd9

Change-Id: Icdce4207cb64e084e200b6f7f8ae194831d5c4f0
2016-11-15 22:11:21 +00:00
Tao Bao
787482ecd9 Merge "ziparchive: Allow ExtractEntryToFile() to work with block device." 2016-11-15 22:00:47 +00:00
Elliott Hughes
06d14cd839 Merge "Switch fastboot/init/libprocessgroup to std::this_thread::sleep_for." am: f3e731b3c5 am: 3ee9807554
am: 74c997ffda

Change-Id: I57271eec1814ff0188fa7a3b31f837de6e5b7467
2016-11-15 18:25:18 +00:00
Tao Bao
a456c21348 ziparchive: Allow ExtractEntryToFile() to work with block device.
FileWriter::Create() calls ftruncate(2) to truncate the destination
file, which doesn't work with FD that references a block device. It
leads to kIoError when calling ExtractEntryToFile() to extract an entry
to block device FD.

As a result, it fails the package_extract_file() command in OTA updates
(e.g. 'package_extract_file("boot.img",
"/dev/block/platform/soc.0/f9824900.sdhci/by-name/boot")').

This CL skips the call to ftruncate(2) if FD references a block device.

Bug: 32903624
Test: ziparchive-tests works.
Test: Build an OTA updater (m updater) and call package_extract_file().

Change-Id: Ia81116f1a8d7cab802396bdc32c6096b4cb56a3c
2016-11-15 10:19:04 -08:00
Elliott Hughes
74c997ffda Merge "Switch fastboot/init/libprocessgroup to std::this_thread::sleep_for." am: f3e731b3c5
am: 3ee9807554

Change-Id: I38158643aac35663d96a5e6760bbd217cda955ca
2016-11-15 18:17:16 +00:00
Elliott Hughes
3ee9807554 Merge "Switch fastboot/init/libprocessgroup to std::this_thread::sleep_for."
am: f3e731b3c5

Change-Id: I2028bb8835c5e55e1bf8c88c3395253ded9d66d3
2016-11-15 18:09:46 +00:00
Elliott Hughes
f3e731b3c5 Merge "Switch fastboot/init/libprocessgroup to std::this_thread::sleep_for." 2016-11-15 18:02:30 +00:00
Wei Wang
db738953f4 Merge "init: fix BuildTriggersString for empty string" am: 9b1d5e15ef am: 4286801ccb
am: 8256062afc

Change-Id: I92fcc30a07290976f28a63da3310efff6ca29c7c
2016-11-15 17:47:15 +00:00
Wei Wang
8256062afc Merge "init: fix BuildTriggersString for empty string" am: 9b1d5e15ef
am: 4286801ccb

Change-Id: I6744e47cc9e85f86217d0c6ecc96e6011e82d99a
2016-11-15 17:39:45 +00:00
Wei Wang
4286801ccb Merge "init: fix BuildTriggersString for empty string"
am: 9b1d5e15ef

Change-Id: Ia344bac744e767ab26d7811ceb2806cce5f28a60
2016-11-15 17:32:13 +00:00
Treehugger Robot
9b1d5e15ef Merge "init: fix BuildTriggersString for empty string" 2016-11-15 17:23:56 +00:00
Nick Desaulniers
d7a92fd874 Merge "Revert "init: warn slow action"" am: 431c489568 am: ea516950fb
am: 6133e64575

Change-Id: I736f5ca11284bf9470a6591019c12d45c1f8ff3b
2016-11-15 07:20:42 +00:00
Nick Desaulniers
6133e64575 Merge "Revert "init: warn slow action"" am: 431c489568
am: ea516950fb

Change-Id: I0839b87695043ce0efbf921ffd94364091991b65
2016-11-15 07:12:41 +00:00
Nick Desaulniers
ea516950fb Merge "Revert "init: warn slow action""
am: 431c489568

Change-Id: I570911d0940fa6819de6f07e0d88cfadbfb6bdd1
2016-11-15 07:05:12 +00:00
Treehugger Robot
431c489568 Merge "Revert "init: warn slow action"" 2016-11-15 06:58:53 +00:00
Daichi Hirono
378b38826e Merge "Add static assert to check if FuseBuffer is standard layout union." am: a0967504f9 am: 83e2cfdf52
am: f5cab9d7f1

Change-Id: I7c06ccbd2363cb071214d10e8683ce377c2b8dab
2016-11-15 06:11:39 +00:00
Daichi Hirono
f5cab9d7f1 Merge "Add static assert to check if FuseBuffer is standard layout union." am: a0967504f9
am: 83e2cfdf52

Change-Id: I29b3ee5ee30317493513cb4e218330cdeb98afe2
2016-11-15 06:04:08 +00:00
Daichi Hirono
83e2cfdf52 Merge "Add static assert to check if FuseBuffer is standard layout union."
am: a0967504f9

Change-Id: Id2ba10a4a905b5c6c96f64f689b951e8798ecb64
2016-11-15 05:56:38 +00:00
Treehugger Robot
a0967504f9 Merge "Add static assert to check if FuseBuffer is standard layout union." 2016-11-15 05:43:15 +00:00
Wei Wang
69b9b36c11 init: fix BuildTriggersString for empty string
behavior is undefined if pop_back() on empty std::string

Test: grep init log
Bug: 32712851
Bug: 32838381
Change-Id: I5bfac2fb275036abd0158b78df14019d2e82716d
2016-11-14 20:20:48 -08:00
Daichi Hirono
37e2624354 Merge "Add FuseAppLoop to libappfuse." am: e1d24f8465 am: 1eda78472a
am: 5fc0b1ed1f

Change-Id: Idf224e48aa8a1900e341c51ffcb0e5e0d4eb8ee3
2016-11-15 03:05:33 +00:00
Daichi Hirono
5fc0b1ed1f Merge "Add FuseAppLoop to libappfuse." am: e1d24f8465
am: 1eda78472a

Change-Id: If03248dcf5efdc46c735fb50d217aadb8a97cd3c
2016-11-15 02:58:30 +00:00
Daichi Hirono
1eda78472a Merge "Add FuseAppLoop to libappfuse."
am: e1d24f8465

Change-Id: Ic15e0ca892a1432fa82cfd80737cbf95a976fab4
2016-11-15 02:51:04 +00:00
Treehugger Robot
e1d24f8465 Merge "Add FuseAppLoop to libappfuse." 2016-11-15 02:35:42 +00:00
Josh Gao
219ccb6697 Merge "libprocinfo: introduce." am: f4cdb6aeaf am: 771d6ea526
am: f5048a3a45

Change-Id: Ia321bf46ea581615279f5bd30694739834ead270
2016-11-15 01:58:26 +00:00
Josh Gao
f5048a3a45 Merge "libprocinfo: introduce." am: f4cdb6aeaf
am: 771d6ea526

Change-Id: Ife07abd8ca3dd98c1d3dd37d511280a767d08770
2016-11-15 01:51:26 +00:00
Josh Gao
771d6ea526 Merge "libprocinfo: introduce."
am: f4cdb6aeaf

Change-Id: I7d8cd121342037e86dc5404a72a7c0a2ce88641a
2016-11-15 01:44:26 +00:00
Josh Gao
f4cdb6aeaf Merge "libprocinfo: introduce." 2016-11-15 01:39:04 +00:00
Daichi Hirono
0d97be4d7d Add static assert to check if FuseBuffer is standard layout union.
Bug: 32260320
Test: libappfuse_test
Change-Id: I6430c11fdeb2405996410c97044b4260c25209b8
2016-11-15 10:18:37 +09:00
Elliott Hughes
290a228fdc Switch fastboot/init/libprocessgroup to std::this_thread::sleep_for.
Bug: http://b/32878766
Test: boots
Change-Id: Ie0ddfb7e60f2da5f6eefbb10c83a92e88c137ae3
2016-11-14 17:08:47 -08:00
Nick Desaulniers
1802d11cc7 Revert "init: warn slow action"
This reverts commit b1a309ac1f.

Bug: 32712851
Bug: 32838381
Change-Id: Ib4c47de5ea5b0bad765a43cbff9f73d9978729d4
2016-11-15 00:53:00 +00:00
Daichi Hirono
a0aecda12b Add FuseAppLoop to libappfuse.
The class is used at the app side (StorageManager) to parse FUSE
commands.

Bug: 32260320
Test: libappfuse_test
Change-Id: I1ae2904d3290a041f1efbf8fc10ba032eda5449c
2016-11-15 09:47:31 +09:00
Josh Gao
ce0228f282 Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev am: b19b5fe08c am: 50fb0a1f11 am: 85b6b13175 am: 4775e66996 am: 750b4c3c5f am: 667e9f92d4 am: c88a4dc090 am: 3b0772f718 am: 53a345a063 am: e3e5ea98b9 am: 9d7e954e22 am: 1a7f21d108 am: 62d55cdc90 am: b928a3485a
am: fd53e73066

Change-Id: Idc4cee149c0975473cff4420b8670d8559851e60
2016-11-15 00:03:02 +00:00
Josh Gao
9ce158b16d adb: turn darwin/windows builds back on, hopefully fix them. am: a9c0ac0c46 am: e4e1ed0e5b am: ddf0740c08 am: 8b88eb368a -s ours am: 5c81df2726 am: f55e22a7d3 am: df519a87fb am: 7f523007a1 am: 5a91535d1f am: d4b7250550 am: b71782888f am: 8dac33914a am: 2a201fff82 am: a198e406c8
am: cbae93d213

Change-Id: Ib9fb5c73c40790e1d981e2bde78eacb6755d58d4
2016-11-15 00:02:47 +00:00
Josh Gao
fd53e73066 Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev am: b19b5fe08c am: 50fb0a1f11 am: 85b6b13175 am: 4775e66996 am: 750b4c3c5f am: 667e9f92d4 am: c88a4dc090 am: 3b0772f718 am: 53a345a063 am: e3e5ea98b9 am: 9d7e954e22 am: 1a7f21d108 am: 62d55cdc90
am: b928a3485a

Change-Id: I103114547136457dd076e73f34b4c0e305c68e69
2016-11-14 23:55:03 +00:00
Josh Gao
cbae93d213 adb: turn darwin/windows builds back on, hopefully fix them. am: a9c0ac0c46 am: e4e1ed0e5b am: ddf0740c08 am: 8b88eb368a -s ours am: 5c81df2726 am: f55e22a7d3 am: df519a87fb am: 7f523007a1 am: 5a91535d1f am: d4b7250550 am: b71782888f am: 8dac33914a am: 2a201fff82
am: a198e406c8

Change-Id: Iaa94f991fc57b3541c70337bb84fb621412ac3f2
2016-11-14 23:54:47 +00:00
Josh Gao
b928a3485a Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev am: b19b5fe08c am: 50fb0a1f11 am: 85b6b13175 am: 4775e66996 am: 750b4c3c5f am: 667e9f92d4 am: c88a4dc090 am: 3b0772f718 am: 53a345a063 am: e3e5ea98b9 am: 9d7e954e22 am: 1a7f21d108
am: 62d55cdc90

Change-Id: I2134fa1768433ec93eaf67062167d6f8bd7e5cab
2016-11-14 23:48:01 +00:00
Josh Gao
a198e406c8 adb: turn darwin/windows builds back on, hopefully fix them. am: a9c0ac0c46 am: e4e1ed0e5b am: ddf0740c08 am: 8b88eb368a -s ours am: 5c81df2726 am: f55e22a7d3 am: df519a87fb am: 7f523007a1 am: 5a91535d1f am: d4b7250550 am: b71782888f am: 8dac33914a
am: 2a201fff82

Change-Id: Ic922ffbab5ee6041db0992fb486553057cb6bce4
2016-11-14 23:47:45 +00:00
Josh Gao
62d55cdc90 Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev am: b19b5fe08c am: 50fb0a1f11 am: 85b6b13175 am: 4775e66996 am: 750b4c3c5f am: 667e9f92d4 am: c88a4dc090 am: 3b0772f718 am: 53a345a063 am: e3e5ea98b9 am: 9d7e954e22
am: 1a7f21d108

Change-Id: Id2ae0f5a90acf311a8927ff5fb75ae0bcee112c7
2016-11-14 23:41:00 +00:00
Josh Gao
2a201fff82 adb: turn darwin/windows builds back on, hopefully fix them. am: a9c0ac0c46 am: e4e1ed0e5b am: ddf0740c08 am: 8b88eb368a -s ours am: 5c81df2726 am: f55e22a7d3 am: df519a87fb am: 7f523007a1 am: 5a91535d1f am: d4b7250550 am: b71782888f
am: 8dac33914a

Change-Id: I1210cc4b11463c37595e6fcc39812c754c969e84
2016-11-14 23:40:45 +00:00
Josh Gao
1a7f21d108 Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev am: b19b5fe08c am: 50fb0a1f11 am: 85b6b13175 am: 4775e66996 am: 750b4c3c5f am: 667e9f92d4 am: c88a4dc090 am: 3b0772f718 am: 53a345a063 am: e3e5ea98b9
am: 9d7e954e22

Change-Id: Ibe3413768c5cbde65c323016b23d5342ac2e51e3
2016-11-14 23:33:30 +00:00
Josh Gao
8dac33914a adb: turn darwin/windows builds back on, hopefully fix them. am: a9c0ac0c46 am: e4e1ed0e5b am: ddf0740c08 am: 8b88eb368a -s ours am: 5c81df2726 am: f55e22a7d3 am: df519a87fb am: 7f523007a1 am: 5a91535d1f am: d4b7250550
am: b71782888f

Change-Id: I7f73c6df381e33c37a38a28af3079dbb453be042
2016-11-14 23:33:14 +00:00
Josh Gao
9d7e954e22 Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev am: b19b5fe08c am: 50fb0a1f11 am: 85b6b13175 am: 4775e66996 am: 750b4c3c5f am: 667e9f92d4 am: c88a4dc090 am: 3b0772f718 am: 53a345a063
am: e3e5ea98b9

Change-Id: I0585d2520be6c85841cf5dd4f9f0c490e01db961
2016-11-14 23:26:00 +00:00
Josh Gao
b71782888f adb: turn darwin/windows builds back on, hopefully fix them. am: a9c0ac0c46 am: e4e1ed0e5b am: ddf0740c08 am: 8b88eb368a -s ours am: 5c81df2726 am: f55e22a7d3 am: df519a87fb am: 7f523007a1 am: 5a91535d1f
am: d4b7250550

Change-Id: Ifbf46403d2148b0d1f17209543ec759536562293
2016-11-14 23:25:45 +00:00
Josh Gao
e3e5ea98b9 Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev am: b19b5fe08c am: 50fb0a1f11 am: 85b6b13175 am: 4775e66996 am: 750b4c3c5f am: 667e9f92d4 am: c88a4dc090 am: 3b0772f718
am: 53a345a063

Change-Id: Ic6bc7537c5039ae30d079a64ac40eb2e7cc30d0c
2016-11-14 23:18:30 +00:00
Josh Gao
d4b7250550 adb: turn darwin/windows builds back on, hopefully fix them. am: a9c0ac0c46 am: e4e1ed0e5b am: ddf0740c08 am: 8b88eb368a -s ours am: 5c81df2726 am: f55e22a7d3 am: df519a87fb am: 7f523007a1
am: 5a91535d1f

Change-Id: Ibe32d196decd8fd9abf235d57e55faa7fe6a797c
2016-11-14 23:18:15 +00:00
Josh Gao
53a345a063 Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev am: b19b5fe08c am: 50fb0a1f11 am: 85b6b13175 am: 4775e66996 am: 750b4c3c5f am: 667e9f92d4 am: c88a4dc090
am: 3b0772f718

Change-Id: Ibe55a81aed808569ed54d65ed1e14b55da8d2ff6
2016-11-14 23:11:00 +00:00
Josh Gao
5a91535d1f adb: turn darwin/windows builds back on, hopefully fix them. am: a9c0ac0c46 am: e4e1ed0e5b am: ddf0740c08 am: 8b88eb368a -s ours am: 5c81df2726 am: f55e22a7d3 am: df519a87fb
am: 7f523007a1

Change-Id: If5a893cc71452d29ad9288d07877de969ccb6c2f
2016-11-14 23:10:43 +00:00