Narayan Kamath
c6b5b67139
Revert "Fix full-eng build breakage due to dbacd826a100f2c."
...
am: d5715c5d2d
Change-Id: Ib6157ce6e2329add7875a9a40f94e3825fdab6ce
2017-10-04 17:34:43 +00:00
Narayan Kamath
d5715c5d2d
Revert "Fix full-eng build breakage due to dbacd826a100f2c."
...
This reverts commit 6e39c88b1e
.
This change should not have automerged to nyc-dev. Still investigating
why that's the case.
Test: make
2017-10-04 18:23:09 +01:00
Narayan Kamath
23fb71b8b9
Fix full-eng build breakage due to dbacd826a1
. am: 6e39c88b1e
am: cb3d79385d
am: 9fd1c2fe65
am: 6f5467da9a
am: a76b9888aa
am: 9c44d4865e
am: cab99bb027
am: da66154ba3
am: 752ab47b98
am: fe9a7192e1
...
am: 2d319cda43
Change-Id: I577ba68bcf8460eca68ab36a492543a1547a0e21
2017-10-04 17:17:07 +00:00
Narayan Kamath
2d319cda43
Fix full-eng build breakage due to dbacd826a1
. am: 6e39c88b1e
am: cb3d79385d
am: 9fd1c2fe65
am: 6f5467da9a
am: a76b9888aa
am: 9c44d4865e
am: cab99bb027
am: da66154ba3
am: 752ab47b98
...
am: fe9a7192e1
Change-Id: Ic09929e88fb415a3c1a9279c060bbc1ec2b24380
2017-10-04 17:14:56 +00:00
Narayan Kamath
fe9a7192e1
Fix full-eng build breakage due to dbacd826a1
. am: 6e39c88b1e
am: cb3d79385d
am: 9fd1c2fe65
am: 6f5467da9a
am: a76b9888aa
am: 9c44d4865e
am: cab99bb027
am: da66154ba3
...
am: 752ab47b98
Change-Id: I928024fd982722adb0b8e91172db5ec28c6cf0b0
2017-10-04 17:09:03 +00:00
Narayan Kamath
752ab47b98
Fix full-eng build breakage due to dbacd826a1
. am: 6e39c88b1e
am: cb3d79385d
am: 9fd1c2fe65
am: 6f5467da9a
am: a76b9888aa
am: 9c44d4865e
am: cab99bb027
...
am: da66154ba3
Change-Id: I9cf9163b6676b1a61179c986893db28fe8992230
2017-10-04 17:00:30 +00:00
Narayan Kamath
da66154ba3
Fix full-eng build breakage due to dbacd826a1
. am: 6e39c88b1e
am: cb3d79385d
am: 9fd1c2fe65
am: 6f5467da9a
am: a76b9888aa
am: 9c44d4865e
...
am: cab99bb027
Change-Id: I56c801694e58b90a572563936e9b593fa11eda7e
2017-10-04 16:56:42 +00:00
Narayan Kamath
cab99bb027
Fix full-eng build breakage due to dbacd826a1
. am: 6e39c88b1e
am: cb3d79385d
am: 9fd1c2fe65
am: 6f5467da9a
am: a76b9888aa
...
am: 9c44d4865e
Change-Id: Ia1270b19491530ce227252ebe3354d409fb1fb8c
2017-10-04 16:48:07 +00:00
Narayan Kamath
9c44d4865e
Fix full-eng build breakage due to dbacd826a1
. am: 6e39c88b1e
am: cb3d79385d
am: 9fd1c2fe65
am: 6f5467da9a
...
am: a76b9888aa
Change-Id: I09d25914710df08e60254096f5a8806adb06afd1
2017-10-04 16:42:13 +00:00
Narayan Kamath
a76b9888aa
Fix full-eng build breakage due to dbacd826a1
. am: 6e39c88b1e
am: cb3d79385d
am: 9fd1c2fe65
...
am: 6f5467da9a
Change-Id: I9a9449b4653be6b9bedc1ede59ef553e3c9b35e7
2017-10-04 16:33:57 +00:00
Narayan Kamath
6f5467da9a
Fix full-eng build breakage due to dbacd826a1
. am: 6e39c88b1e
am: cb3d79385d
...
am: 9fd1c2fe65
Change-Id: I2eb887dad807e8f0f77620f3545bda3747a5013c
2017-10-04 16:31:33 +00:00
Narayan Kamath
9fd1c2fe65
Fix full-eng build breakage due to dbacd826a1
. am: 6e39c88b1e
...
am: cb3d79385d
Change-Id: Id0425c97a4d88c9fdce284805b79442e2547e4fd
2017-10-04 16:26:16 +00:00
Mark Salyzyn
415f9b864b
Merge "base: chrono_utils: supported in linux" am: 142303b9d9
...
am: 8b8fc5cfae
Change-Id: Iece4a2cde93b4bfbad478eb325e9620f22b1bbd0
2017-10-04 16:18:11 +00:00
Narayan Kamath
cb3d79385d
Fix full-eng build breakage due to dbacd826a1
.
...
am: 6e39c88b1e
Change-Id: I494d0bd10336ca9c8e771a6a341f6e06578bb59a
2017-10-04 16:16:21 +00:00
Mark Salyzyn
8b8fc5cfae
Merge "base: chrono_utils: supported in linux"
...
am: 142303b9d9
Change-Id: I30a7f0d41fbb48032d2c4133d34c185fedc292a5
2017-10-04 16:12:33 +00:00
Mark Salyzyn
142303b9d9
Merge "base: chrono_utils: supported in linux"
2017-10-04 15:55:56 +00:00
Narayan Kamath
66ec509a64
zip_archive: reject files that don't start with an LFH signature. am: dbacd826a1
am: 368ec42fa8
am: 6dbd1db1cf
am: 58c10b2ab9
-s ours am: 2dbba44e2d
am: 583a11b339
am: 15d221c0ba
am: 377f534697
am: 1cd5954ced
am: 4168856cf2
...
am: 53f49bc4ec
Change-Id: I0d7d3740a510fad091025f1590d903dbadd54c04
2017-10-04 15:49:24 +00:00
Narayan Kamath
53f49bc4ec
zip_archive: reject files that don't start with an LFH signature. am: dbacd826a1
am: 368ec42fa8
am: 6dbd1db1cf
am: 58c10b2ab9
-s ours am: 2dbba44e2d
am: 583a11b339
am: 15d221c0ba
am: 377f534697
am: 1cd5954ced
...
am: 4168856cf2
Change-Id: I401b78b71fa35bcb20ab23a52d1f37798848d9f1
2017-10-04 15:46:16 +00:00
Narayan Kamath
4168856cf2
zip_archive: reject files that don't start with an LFH signature. am: dbacd826a1
am: 368ec42fa8
am: 6dbd1db1cf
am: 58c10b2ab9
-s ours am: 2dbba44e2d
am: 583a11b339
am: 15d221c0ba
am: 377f534697
...
am: 1cd5954ced
Change-Id: I5f727e6e2db14004af625f7a81af3416cfcaefe1
2017-10-04 15:39:45 +00:00
Narayan Kamath
1cd5954ced
zip_archive: reject files that don't start with an LFH signature. am: dbacd826a1
am: 368ec42fa8
am: 6dbd1db1cf
am: 58c10b2ab9
-s ours am: 2dbba44e2d
am: 583a11b339
am: 15d221c0ba
...
am: 377f534697
Change-Id: I2abd52cf566ae45486831c42a7c72d2e2b000a4c
2017-10-04 15:36:04 +00:00
Narayan Kamath
377f534697
zip_archive: reject files that don't start with an LFH signature. am: dbacd826a1
am: 368ec42fa8
am: 6dbd1db1cf
am: 58c10b2ab9
-s ours am: 2dbba44e2d
am: 583a11b339
...
am: 15d221c0ba
Change-Id: I0aa0d98639111f48dc0fb2007928e1a6b8b0d174
2017-10-04 15:26:13 +00:00
Narayan Kamath
15d221c0ba
zip_archive: reject files that don't start with an LFH signature. am: dbacd826a1
am: 368ec42fa8
am: 6dbd1db1cf
am: 58c10b2ab9
-s ours am: 2dbba44e2d
...
am: 583a11b339
Change-Id: I215d12f87d5d644f6ded52a59173d4d7f5940d07
2017-10-04 15:21:14 +00:00
Narayan Kamath
583a11b339
zip_archive: reject files that don't start with an LFH signature. am: dbacd826a1
am: 368ec42fa8
am: 6dbd1db1cf
am: 58c10b2ab9
-s ours
...
am: 2dbba44e2d
Change-Id: I05eda8a0b1f41b979e5673b822865315244fc4ac
2017-10-04 15:18:57 +00:00
Narayan Kamath
6e39c88b1e
Fix full-eng build breakage due to dbacd826a1
.
...
This wasn't caught by treehugger since it doesn't build this target.
Test: make
Test: zip_archive_test
Bug: 64211847
Change-Id: Iee6e133e236ed639f944e4b8c3c8102cf22e46bb
Merged-In: I275e7c4da05ceeb20401b560c72294f29ef63642
2017-10-04 16:18:03 +01:00
Narayan Kamath
2dbba44e2d
zip_archive: reject files that don't start with an LFH signature. am: dbacd826a1
am: 368ec42fa8
am: 6dbd1db1cf
...
am: 58c10b2ab9
-s ours
Change-Id: If2661808611e72def97f08cec94352adcdef21b2
2017-10-04 15:16:23 +00:00
Narayan Kamath
58c10b2ab9
zip_archive: reject files that don't start with an LFH signature. am: dbacd826a1
am: 368ec42fa8
...
am: 6dbd1db1cf
Change-Id: I1cedab2b7136dce49722d88266a36a8e37d97b0a
2017-10-04 14:53:40 +00:00
Narayan Kamath
6dbd1db1cf
zip_archive: reject files that don't start with an LFH signature. am: dbacd826a1
...
am: 368ec42fa8
Change-Id: Ie828c72438e70817d134e8b09512c3d10d60e407
2017-10-04 14:51:01 +00:00
Narayan Kamath
368ec42fa8
zip_archive: reject files that don't start with an LFH signature.
...
am: dbacd826a1
Change-Id: I85664bba898d6be9fff53bc3514c44df4be6cfc7
2017-10-04 14:45:00 +00:00
Narayan Kamath
b487b7c954
zip_archive: reject files that don't start with an LFH signature. am: 2740bb09e3
am: 61f846b71c
am: 45931c5e03
am: b1b91cff95
am: a2dc43197d
-s ours am: edccf1c133
-s ours
...
am: f49275fa53
-s ours
Change-Id: I70a0d9a469318882dc55f4b901834662738ba9b4
2017-10-04 13:48:25 +00:00
Narayan Kamath
e251b587b7
Merge "resolve merge conflicts of 3765bf9bd
to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
2017-10-04 13:39:38 +00:00
Narayan Kamath
f49275fa53
zip_archive: reject files that don't start with an LFH signature. am: 2740bb09e3
am: 61f846b71c
am: 45931c5e03
am: b1b91cff95
am: a2dc43197d
-s ours
...
am: edccf1c133
-s ours
Change-Id: I4320e562175130e24b32b98cffb73cfd763cc90c
2017-10-04 12:16:42 +00:00
Narayan Kamath
edccf1c133
zip_archive: reject files that don't start with an LFH signature. am: 2740bb09e3
am: 61f846b71c
am: 45931c5e03
am: b1b91cff95
...
am: a2dc43197d
-s ours
Change-Id: Ie5bb95e27b2aad0e61e15f30899202303afaae81
2017-10-04 12:12:03 +00:00
Narayan Kamath
a2dc43197d
zip_archive: reject files that don't start with an LFH signature. am: 2740bb09e3
am: 61f846b71c
am: 45931c5e03
...
am: b1b91cff95
Change-Id: Icdf4da6ae83f0ed8932c173559267f8e354d11c3
2017-10-04 12:06:15 +00:00
Narayan Kamath
b1b91cff95
zip_archive: reject files that don't start with an LFH signature. am: 2740bb09e3
am: 61f846b71c
...
am: 45931c5e03
Change-Id: Ibc1d1a44c0a656e45d079e37470bb0021e7ba9ab
2017-10-04 12:03:27 +00:00
Narayan Kamath
45931c5e03
zip_archive: reject files that don't start with an LFH signature. am: 2740bb09e3
...
am: 61f846b71c
Change-Id: I02f427582b1e62e3fad2747eb6ac79aa8622ff20
2017-10-04 12:01:11 +00:00
Narayan Kamath
61f846b71c
zip_archive: reject files that don't start with an LFH signature.
...
am: 2740bb09e3
Change-Id: I7a61a1e7f21edfccc14a3333913f4e1db79ac23c
2017-10-04 11:58:48 +00:00
Narayan Kamath
a79e01b62e
resolve merge conflicts of 3765bf9bd
to oc-dr1-dev-plus-aosp
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I77e438d4998c241e018a3169848b2ab7c0a403eb
2017-10-04 12:39:01 +01:00
Narayan Kamath
3765bf9bd4
zip_archive: reject files that don't start with an LFH signature.
...
am: 9dced16262
Change-Id: Iaca1185e09d1eb610d6b95bf40ec62e50676b40a
2017-10-04 10:51:05 +00:00
Jayant Chowdhary
7b9c789d23
Merge "Make liblog headers compile stand-alone." am: fe3551e9dc
...
am: b637860732
Change-Id: I4a4a7ac46e18765243b5c8ed27414e16c9008f54
2017-10-04 00:57:48 +00:00
Jayant Chowdhary
b637860732
Merge "Make liblog headers compile stand-alone."
...
am: fe3551e9dc
Change-Id: I20b97d38d356f720c74954200f40b8315cdd0c21
2017-10-04 00:55:47 +00:00
Treehugger Robot
fe3551e9dc
Merge "Make liblog headers compile stand-alone."
2017-10-04 00:49:55 +00:00
Tom Cherry
d1721a9901
Merge "init: log failures if a service cannot start during class_start" am: 533fbd62ab
...
am: 5c00898944
Change-Id: I3a64b21ee76c5ef55174d5cc85ac71f17a7ef19d
2017-10-03 22:47:16 +00:00
Tom Cherry
5c00898944
Merge "init: log failures if a service cannot start during class_start"
...
am: 533fbd62ab
Change-Id: I7a05ae9f806a23d04d649fb230e2875633b2caee
2017-10-03 22:42:51 +00:00
Elliott Hughes
3ef8d2abca
Merge "Set $HOSTNAME in adbd." am: 2364d7ccc5
...
am: 510552149c
Change-Id: I9aaae73846ed0388b24769589a14d9d824372ca9
2017-10-03 22:38:59 +00:00
Elliott Hughes
510552149c
Merge "Set $HOSTNAME in adbd."
...
am: 2364d7ccc5
Change-Id: I40ef480380f250540d6c2856721540400c599111
2017-10-03 22:32:13 +00:00
Treehugger Robot
533fbd62ab
Merge "init: log failures if a service cannot start during class_start"
2017-10-03 22:03:33 +00:00
Elliott Hughes
2364d7ccc5
Merge "Set $HOSTNAME in adbd."
2017-10-03 21:57:49 +00:00
Mark Salyzyn
1f9fa7e907
base: chrono_utils: supported in linux
...
Tried to use this on host executable, and it always read back zero
for duration. Expanded code to support any linux build.
Test: works on host
Bug: 38446744
Bug: 66912053
Change-Id: I4a2cbbfff3e7739b54cb6c6e877898de4d3d2296
2017-10-03 14:53:26 -07:00
Jayant Chowdhary
12f56a00d3
Make liblog headers compile stand-alone.
...
Test: process liblog headers individually with header-abi-dumper.
Test: mm -j64
Bug: 66971285
Change-Id: If7dec611b84eb9fa8e1e5a974b444d4ddf54759a
2017-10-03 14:06:33 -07:00
Tom Cherry
20acdef816
init: log failures if a service cannot start during class_start
...
Test: boot system with this logging and see appropriate failures
Change-Id: I312dca89f6215afe05b10b2539258a212a0c1ae2
2017-10-03 13:16:00 -07:00