Commit graph

35597 commits

Author SHA1 Message Date
Tom Cherry
c0a9cf648b Merge "Move Timer from init to libbase" am: 896297b2ef am: 7ff0b008f7
am: 4e5c4f18d8

Change-Id: Iffad0dcde94fce7dac627ebf0530420f9cfd38d1
2017-07-10 18:36:54 +00:00
Tom Cherry
4e5c4f18d8 Merge "Move Timer from init to libbase" am: 896297b2ef
am: 7ff0b008f7

Change-Id: I3d1dd6eabbf17d701eefbf7363bfe6107d4de8a4
2017-07-10 18:32:54 +00:00
Tom Cherry
7ff0b008f7 Merge "Move Timer from init to libbase"
am: 896297b2ef

Change-Id: I1990fa013fa1fe69a61711faf032db45216f6f47
2017-07-10 18:28:25 +00:00
Tom Cherry
896297b2ef Merge "Move Timer from init to libbase" 2017-07-10 18:23:29 +00:00
nickrose
653d49a245 Add logd CTS tests to VTS
Follow-up to  Change-Id: Id52ac1639447276171006c33bdfa7b4e6c874745

Test: make vts
Change-Id: Ibeb5082439ada49a6eccd6fb699e466ca71730c9
2017-07-10 11:17:38 -07:00
Tom Cherry
ede0d53850 Move Timer from init to libbase
Test: boot bullhead
Test: new libbase unit tests

Change-Id: Ic398a1daa1fe92c10ea7bc1e6ac3f781cee9a5b5
2017-07-10 09:28:24 -07:00
Ian Elliott
766d494612 Merge "Use void instead of no parameters in 2 function declarations." am: 11b91e7c28 am: cbe556ee62 am: 2a064ca6e4
am: 3bfce07b86

Change-Id: I1a59b2e53dd83ef3630a6677e75e15b651481493
2017-07-10 12:21:43 +00:00
Ian Elliott
3bfce07b86 Merge "Use void instead of no parameters in 2 function declarations." am: 11b91e7c28 am: cbe556ee62
am: 2a064ca6e4

Change-Id: I8292eead31f078714d6a869f8f10409650ebc91f
2017-07-10 12:17:12 +00:00
Ian Elliott
2a064ca6e4 Merge "Use void instead of no parameters in 2 function declarations." am: 11b91e7c28
am: cbe556ee62

Change-Id: I45e39dbfa1b29e4d7384dc5fcf982b8d8d607a50
2017-07-10 12:12:39 +00:00
Ian Elliott
cbe556ee62 Merge "Use void instead of no parameters in 2 function declarations."
am: 11b91e7c28

Change-Id: Ie41c3cbf8c6017994d3728c638fc85c55df3ec94
2017-07-10 12:09:43 +00:00
Ian Elliott
11b91e7c28 Merge "Use void instead of no parameters in 2 function declarations." 2017-07-10 12:01:51 +00:00
Luca Stefani
0870514d29 logcat: Add missing newline to read failure
Change-Id: I468b3bd00f1effa43eb139a3c514ba042ae3dff7
2017-07-08 17:51:27 +02:00
Tim Murray
7af0deb144 Merge "Revert "Use mem cgroups in libprocessgroup if they're available"" am: e8a75e8f76 am: 7f857bb9ff am: ac68c7fc8c
am: 2c0f9c3a72

Change-Id: I36ef31b921d56222902c4bba8f891d6d21dad947
2017-07-08 01:52:51 +00:00
Tim Murray
2c0f9c3a72 Merge "Revert "Use mem cgroups in libprocessgroup if they're available"" am: e8a75e8f76 am: 7f857bb9ff
am: ac68c7fc8c

Change-Id: I19e5d24a936e992bb634fd589ce04416dbf07c21
2017-07-08 01:50:20 +00:00
Tim Murray
ac68c7fc8c Merge "Revert "Use mem cgroups in libprocessgroup if they're available"" am: e8a75e8f76
am: 7f857bb9ff

Change-Id: I76ae76656e3b7da66c8bcf64534061a585386dfe
2017-07-08 01:47:51 +00:00
Tim Murray
7f857bb9ff Merge "Revert "Use mem cgroups in libprocessgroup if they're available""
am: e8a75e8f76

Change-Id: Iec01b90ae7d49d1eaf4a6e0c5324749a358db5d6
2017-07-08 01:45:50 +00:00
Treehugger Robot
e8a75e8f76 Merge "Revert "Use mem cgroups in libprocessgroup if they're available"" 2017-07-08 01:41:19 +00:00
Tim Murray
fc10e3d5e5 Revert "Use mem cgroups in libprocessgroup if they're available"
This reverts commit 32375c2328.

bug 63164307

Change-Id: I3336bbf7c2f3297b231c5b0a1ef538faff9513fd
2017-07-08 00:04:42 +00:00
Ian Elliott
58e06c5f94 Use void instead of no parameters in 2 function declarations.
In compiling some code with a picky "Android.mk" file, it is not happy
with a function declaration that looks like:

    void foo();

It requires:

    void foo(void);

This commit changes that for 2 functions in "log.h".

Test: Build both Android and the code with a picky "Android.mk".
Change-Id: Icd624df34db57e642fe6b1c7da77be9b05936936
2017-07-07 16:11:32 -06:00
Christopher Ferris
ab2a91309b Merge "Add missing test files to compile." am: 32ac9bfd09 am: 793ffcbf20 am: 6864f006a2
am: 5ef15a9fa9

Change-Id: I5e395b738d0769992e05c31331015ea7a347b129
2017-07-07 21:50:01 +00:00
Christopher Ferris
5ef15a9fa9 Merge "Add missing test files to compile." am: 32ac9bfd09 am: 793ffcbf20
am: 6864f006a2

Change-Id: I76543669231ac564f14921beabcc705c9850bd4d
2017-07-07 21:45:35 +00:00
Christopher Ferris
6864f006a2 Merge "Add missing test files to compile." am: 32ac9bfd09
am: 793ffcbf20

Change-Id: I867640a5496c42a6b10161a84c9aa1c6928153b3
2017-07-07 21:39:01 +00:00
Christopher Ferris
793ffcbf20 Merge "Add missing test files to compile."
am: 32ac9bfd09

Change-Id: Iaf2ebb9f3d39b2e99724b2bed0512b4f0bb3da3c
2017-07-07 21:33:49 +00:00
Christopher Ferris
32ac9bfd09 Merge "Add missing test files to compile." 2017-07-07 21:26:30 +00:00
Christopher Ferris
9744fb2b54 Add missing test files to compile.
Bug: 23762183

Test: Ran unit tests.
Change-Id: I8ac43517231d88c68c288800d8ed286daa57bce1
2017-07-07 12:25:23 -07:00
Christopher Ferris
7da744366b Merge "Init .gnu_debugdata in GetElf()." am: 2d07f72961 am: f5b374a8b3 am: 67930a0b5e
am: f55852dc91

Change-Id: I75aa1873e0b27fadef2ea9543a13c6280303513c
2017-07-07 19:08:10 +00:00
Christopher Ferris
f55852dc91 Merge "Init .gnu_debugdata in GetElf()." am: 2d07f72961 am: f5b374a8b3
am: 67930a0b5e

Change-Id: I9ae9f59ae7e4df8abca0907dc74c514558270acb
2017-07-07 19:06:10 +00:00
Christopher Ferris
67930a0b5e Merge "Init .gnu_debugdata in GetElf()." am: 2d07f72961
am: f5b374a8b3

Change-Id: Ib61a01def4c0c33979812bf1812fadd14ecaa6a5
2017-07-07 19:03:39 +00:00
Christopher Ferris
f5b374a8b3 Merge "Init .gnu_debugdata in GetElf()."
am: 2d07f72961

Change-Id: I485c6211dfef3b0468dcdd9cf8cc9347b2563231
2017-07-07 19:01:11 +00:00
Christopher Ferris
2d07f72961 Merge "Init .gnu_debugdata in GetElf()." 2017-07-07 18:56:56 +00:00
Yongqin Liu
2ab73cabd1 Merge "Merge "bootstat.cpp: update help message for --record_boot_complete" am: f444650d0d" into stage-aosp-master am: 200d376b75 am: 23366008c6
am: 3e4e2a078b

Change-Id: I1b7b2f019c5659bea00088044fc4fa77a07bcfae
2017-07-07 18:39:10 +00:00
Yongqin Liu
05b10c8683 Merge "bootstat.cpp: update help message for --record_boot_complete" am: f444650d0d am: efe27cd2f6 am: e5169979b4
am: e0c1ed5ef9

Change-Id: I33dd27f8ee36b1343e470fd9e69f42c5cfb8972b
2017-07-07 18:38:54 +00:00
Yongqin Liu
3e4e2a078b Merge "Merge "bootstat.cpp: update help message for --record_boot_complete" am: f444650d0d" into stage-aosp-master am: 200d376b75
am: 23366008c6

Change-Id: Iea2d0e887ea4c3dd0188de4a09c2d3458e96e453
2017-07-07 18:06:59 +00:00
Yongqin Liu
e0c1ed5ef9 Merge "bootstat.cpp: update help message for --record_boot_complete" am: f444650d0d am: efe27cd2f6
am: e5169979b4

Change-Id: I828c158f9f227228fe4f914b0539116d2a0f25cc
2017-07-07 18:06:44 +00:00
Yongqin Liu
23366008c6 Merge "Merge "bootstat.cpp: update help message for --record_boot_complete" am: f444650d0d" into stage-aosp-master
am: 200d376b75

Change-Id: I29420634888671b377e34729fcc2880ee6612420
2017-07-07 17:47:36 +00:00
Yongqin Liu
e5169979b4 Merge "bootstat.cpp: update help message for --record_boot_complete" am: f444650d0d
am: efe27cd2f6

Change-Id: Ifa8e70ae64d51b2b0df28c1b21c7ad44e0f6dd5b
2017-07-07 17:47:20 +00:00
Android Build Merger (Role)
200d376b75 Merge "Merge "bootstat.cpp: update help message for --record_boot_complete" am: f444650d0d" into stage-aosp-master 2017-07-07 17:43:37 +00:00
Yongqin Liu
b1cef7e70b Merge "bootstat.cpp: update help message for --record_boot_complete"
am: f444650d0d

Change-Id: I63801d806f3ab3bc2977ec74ad003f137899c34a
2017-07-07 17:43:27 +00:00
Yongqin Liu
efe27cd2f6 Merge "bootstat.cpp: update help message for --record_boot_complete"
am: f444650d0d

Change-Id: Ifecefb1d52188d8a82208097f67302c91e30c93e
2017-07-07 17:43:19 +00:00
Treehugger Robot
f444650d0d Merge "bootstat.cpp: update help message for --record_boot_complete" 2017-07-07 17:27:05 +00:00
Yongqin Liu
78b2b94d1d bootstat.cpp: update help message for --record_boot_complete
add description about --record_boot_complete in the help

Test: manually with HiKey

Change-Id: I521d6f5b9d98113c006fc6ab146b6c353ce2390c
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2017-07-07 15:27:10 +00:00
Colin Cross
578fefb16b Merge "Add test config for memunreachable_test" am: a6bee4a29e am: 2abcc0a178 am: df41d4f2a3
am: 49a985b864

Change-Id: I4267ebf9404430b700b4934e9dd5727e8b898887
2017-07-07 04:26:00 +00:00
Colin Cross
49a985b864 Merge "Add test config for memunreachable_test" am: a6bee4a29e am: 2abcc0a178
am: df41d4f2a3

Change-Id: I1b5a695729b09fa55c427c7207ab502834ef0388
2017-07-07 04:22:57 +00:00
Colin Cross
df41d4f2a3 Merge "Add test config for memunreachable_test" am: a6bee4a29e
am: 2abcc0a178

Change-Id: I5edace31d2acdad155c7655a6b563a8e8576e300
2017-07-07 04:20:37 +00:00
Colin Cross
2abcc0a178 Merge "Add test config for memunreachable_test"
am: a6bee4a29e

Change-Id: I90ae7480d84a77143f63d0f5527392a9b0021bb7
2017-07-07 04:17:59 +00:00
Treehugger Robot
a6bee4a29e Merge "Add test config for memunreachable_test" 2017-07-07 04:11:22 +00:00
Colin Cross
6194ce5019 Merge "Remove reference to deleted gzip module" am: 48d610ab18 am: 55665c3c97 am: 2a0f067126
am: 3c49275dfb

Change-Id: If1c755b190e6096059701eb9b1de7b5cf2bc8b57
2017-07-07 02:00:00 +00:00
Colin Cross
3c49275dfb Merge "Remove reference to deleted gzip module" am: 48d610ab18 am: 55665c3c97
am: 2a0f067126

Change-Id: I37fe0fab5d3afc163296116a3f5df4b6e8c59e58
2017-07-07 01:48:49 +00:00
Colin Cross
2a0f067126 Merge "Remove reference to deleted gzip module" am: 48d610ab18
am: 55665c3c97

Change-Id: I888db7ef5fdcf5b80d7317ff806c24506d31c72e
2017-07-07 01:45:46 +00:00
Colin Cross
55665c3c97 Merge "Remove reference to deleted gzip module"
am: 48d610ab18

Change-Id: I5be86c2fb388df0e651c089040adc9be2580f4d6
2017-07-07 01:44:05 +00:00