Commit graph

35269 commits

Author SHA1 Message Date
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
Treehugger Robot
48d610ab18 Merge "Remove reference to deleted gzip module" 2017-07-07 01:34:40 +00:00
Colin Cross
b9e74ba400 Add test config for memunreachable_test
Test: none
Change-Id: Ieb297a2fcece6365a074cd470b3ca56e2baea926
2017-07-07 01:07:05 +00:00
Android Build Merger (Role)
6efd7e65a7 Merge "Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: bb3d4e579c" into oc-dr1-dev-plus-aosp am: a9be33b6b5" 2017-07-07 00:09:41 +00:00
Android Build Merger (Role)
cd678d9bb7 Merge "Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: bb3d4e579c" into oc-dr1-dev-plus-aosp am: e62a5014b5" 2017-07-07 00:09:27 +00:00
Steven Moreland
1aecbdb634 Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: bb3d4e579c" into oc-dr1-dev-plus-aosp
am: e62a5014b5

Change-Id: I57068738488a0a2c28ae1c4ac2b1692003a70a2b
2017-07-07 00:08:45 +00:00
Steven Moreland
1618c25baf Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: bb3d4e579c" into oc-dr1-dev-plus-aosp
am: a9be33b6b5

Change-Id: I247f9290fd98dff63769f418dad7f31199d8c521
2017-07-07 00:08:43 +00:00
Android Build Merger (Role)
afeacbc69c Merge "Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: b3341eef52" into oc-dr1-dev-plus-aosp am: 4911a79078" 2017-07-07 00:08:32 +00:00
Android Build Merger (Role)
6112849c3c Merge "Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: bb3d4e579c" into oc-dr1-dev-plus-aosp am: a9be33b6b5" 2017-07-07 00:08:21 +00:00
Steven Moreland
b2f225c234 Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: bb3d4e579c" into oc-dr1-dev-plus-aosp
am: a9be33b6b5

Change-Id: I421d1a203e2366c7e29080e35ea528f779190c34
2017-07-07 00:07:35 +00:00
Steven Moreland
9822b483d2 Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: b3341eef52" into oc-dr1-dev-plus-aosp
am: 4911a79078

Change-Id: Ibfb26147b10a540fbf9defbdca31eef0afdb8484
2017-07-07 00:07:28 +00:00
Android Build Merger (Role)
b81d6557e0 Merge "Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: b3341eef52" into oc-dr1-dev-plus-aosp am: 15c4cdf9da" 2017-07-07 00:07:15 +00:00
Android Build Merger (Role)
82b11ed218 Merge "Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: b3341eef52" into oc-dr1-dev-plus-aosp am: 4911a79078" 2017-07-07 00:07:12 +00:00
Steven Moreland
16cf0acf2b Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: b3341eef52" into oc-dr1-dev-plus-aosp
am: 4911a79078

Change-Id: I014c4947e1fe3a2902598ffcff0d35d0f0be5de1
2017-07-07 00:06:34 +00:00
Steven Moreland
2d7a510ddd Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: b3341eef52" into oc-dr1-dev-plus-aosp
am: 15c4cdf9da

Change-Id: I11f45d6530e8a3495a2de70dfc87d65d212b1b95
2017-07-07 00:05:57 +00:00
Android Build Merger (Role)
bd3c69add1 Merge "Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: b3341eef52" into oc-dr1-dev-plus-aosp am: 15c4cdf9da" 2017-07-07 00:05:54 +00:00
Android Build Merger (Role)
a45b49840f Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34 am: 1921ab7c0e" into oc-dev-plus-aosp am: 7f895b1438" into oc-dr1-dev-plus-aosp am: 04d18ab666" 2017-07-07 00:05:45 +00:00
Steven Moreland
7aacad7414 Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: b3341eef52" into oc-dr1-dev-plus-aosp
am: 15c4cdf9da

Change-Id: I679503b786735669c44f2769d4997c6d0f1876dc
2017-07-07 00:05:02 +00:00
Steven Moreland
75e32665ba Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34 am: 1921ab7c0e" into oc-dev-plus-aosp am: 7f895b1438" into oc-dr1-dev-plus-aosp
am: 04d18ab666

Change-Id: I76be35d9b50ebf57ab32dd5bae9b109a53280a33
2017-07-07 00:04:46 +00:00
Steven Moreland
5517d55a99 Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34 am: 1921ab7c0e" into oc-dev-plus-aosp am: 7f895b1438" into oc-dr1-dev-plus-aosp
am: 04d18ab666

Change-Id: Idd57b8abb67e2486548e76fa7e24f42f388e7630
2017-07-07 00:03:50 +00:00
Steven Moreland
acf2c2e1d7 Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34 am: 1921ab7c0e" into oc-dev-plus-aosp am: 7f895b1438
am: 953f9670ac

Change-Id: Id7de3377656c87baedb98f0f2282d01bc77a6b00
2017-07-07 00:02:48 +00:00
Steven Moreland
4ebf6ea2fc Merge "Move libnativebridge headers into the module." am: 508e0b8b34 am: 1921ab7c0e am: d46cb65ce4
am: 3d6bb82263

Change-Id: Ic8f142bc5c14b9b2b7beb71c20ca18957f209cc4
2017-07-07 00:01:54 +00:00
Andreas Gampe
9c3706f642 Merge "System/core: Remove include/ziparchive" am: ae590fe723 am: 10e80f3715 am: 19fc21698b
am: 19b8ab995e

Change-Id: Ideea1a5d0c763da2323b146cfedadc30ee1117f8
2017-07-07 00:01:24 +00:00
Android Build Merger (Role)
e62a5014b5 Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: bb3d4e579c" into oc-dr1-dev-plus-aosp 2017-07-06 23:58:22 +00:00
Steven Moreland
86f70ccb9c Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp
am: bb3d4e579c

Change-Id: Ia115b0b98ae996632436327181998ded3d877fb2
2017-07-06 23:58:00 +00:00
Android Build Merger (Role)
a9be33b6b5 Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: bb3d4e579c" into oc-dr1-dev-plus-aosp 2017-07-06 23:57:49 +00:00