OSDN Git Service
Ting-Yuan Huang [Thu, 21 Sep 2017 19:25:19 +0000 (19:25 +0000)]
Merge "Fix reduce_allocation()." am:
7d845bafe5 am:
c32774f81e
am:
968853c765
Change-Id: I4df82170e4d9f4661ae1ef8df384cc45dd6e6920
Ting-Yuan Huang [Thu, 21 Sep 2017 19:22:47 +0000 (19:22 +0000)]
Merge "Fix reduce_allocation()." am:
7d845bafe5
am:
c32774f81e
Change-Id: I58b9a58d1e6b71da1f0c620afa2371f0cfcf2896
Ting-Yuan Huang [Thu, 21 Sep 2017 19:20:29 +0000 (19:20 +0000)]
Merge "Fix reduce_allocation()."
am:
7d845bafe5
Change-Id: I59e51d916e3a4dc6aefab2d41a0ad06a473fef1d
Treehugger Robot [Thu, 21 Sep 2017 19:16:38 +0000 (19:16 +0000)]
Merge "Fix reduce_allocation()."
Yabin Cui [Thu, 21 Sep 2017 01:23:10 +0000 (01:23 +0000)]
Merge "simpleperf: allow inferno to run from any dir." am:
a9e5b352f6 am:
e274d27f2a
am:
2896204393
Change-Id: I2d6bffff9c92f98ca0410923ba7a118903c74e5a
Yabin Cui [Thu, 21 Sep 2017 01:20:11 +0000 (01:20 +0000)]
Merge "simpleperf: allow inferno to run from any dir." am:
a9e5b352f6
am:
e274d27f2a
Change-Id: I532819f154dfccfdc5eb8383c866155e045a3ef1
Yabin Cui [Thu, 21 Sep 2017 01:18:12 +0000 (01:18 +0000)]
Merge "simpleperf: allow inferno to run from any dir."
am:
a9e5b352f6
Change-Id: I33034f54cb0919e1ce5d6152d5a1fbe896ca79b4
Treehugger Robot [Thu, 21 Sep 2017 01:14:34 +0000 (01:14 +0000)]
Merge "simpleperf: allow inferno to run from any dir."
Yabin Cui [Wed, 20 Sep 2017 23:20:04 +0000 (16:20 -0700)]
simpleperf: allow inferno to run from any dir.
Previously inferno.sh/.bat can only run from scripts/, this CL
removes the restriction.
Also add -o option to select report path.
Bug: http://b/
32834638
Test: run test.py.
Change-Id: Ib1651dcd1beedac5be00249150e0b74fea906924
Manoj Gupta [Wed, 20 Sep 2017 00:36:00 +0000 (00:36 +0000)]
Merge "Fix clang static analyzer warnings" am:
797da605d0 am:
b11b9ab538
am:
f8d8a71e1b
Change-Id: Ib910a1a2bc7a5514235d97082b89b67cec616e01
Manoj Gupta [Wed, 20 Sep 2017 00:33:51 +0000 (00:33 +0000)]
Merge "Fix clang static analyzer warnings" am:
797da605d0
am:
b11b9ab538
Change-Id: Ie38a626cc48f5df867bcbaf489c4b2942fb829c7
Manoj Gupta [Wed, 20 Sep 2017 00:30:11 +0000 (00:30 +0000)]
Merge "Fix clang static analyzer warnings"
am:
797da605d0
Change-Id: I5224ae1341e6442f28c044524c3d8b790873cdc8
Treehugger Robot [Wed, 20 Sep 2017 00:23:44 +0000 (00:23 +0000)]
Merge "Fix clang static analyzer warnings"
Mohan Srinivasan [Fri, 15 Sep 2017 21:45:54 +0000 (21:45 +0000)]
Merge "Add writepage(s) blaming support to ioblame." into oc-mr1-dev
am:
7f3beedb7a
Change-Id: I62a4142ebb4016c20130057555d3d9d61b6dcccc
TreeHugger Robot [Fri, 15 Sep 2017 21:37:30 +0000 (21:37 +0000)]
Merge "Add writepage(s) blaming support to ioblame." into oc-mr1-dev
Bill Yi [Fri, 15 Sep 2017 21:23:28 +0000 (21:23 +0000)]
Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD - DO NOT MERGE am:
57df090195 -s ours am:
0b083d58be -s ours
am:
4ed8458384
Change-Id: I4246c353f509604b934b8d130486e26369ec2bf4
Bill Yi [Fri, 15 Sep 2017 21:21:41 +0000 (21:21 +0000)]
Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD - DO NOT MERGE am:
57df090195 -s ours
am:
0b083d58be -s ours
Change-Id: I77bfeeb76d21179afc7eeb972a8a77109bcea010
Bill Yi [Fri, 15 Sep 2017 21:14:45 +0000 (21:14 +0000)]
Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD - DO NOT MERGE
am:
57df090195 -s ours
Change-Id: Ib04ab6d30f4a371d2d73cc7ed39d34775912829e
Bill Yi [Fri, 15 Sep 2017 20:48:14 +0000 (13:48 -0700)]
Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD - DO NOT MERGE
Change-Id: I126b325ab5686ab9a99735d47cad2a20e53022ca
Mohan Srinivasan [Fri, 8 Sep 2017 20:58:47 +0000 (13:58 -0700)]
Add writepage(s) blaming support to ioblame.
Make ioblame use the (f2fs) writepage(s) tracepoint, to attribute
writepage(s) to filenames. Useful to track down and tune apps that
might be writing too much.
Test: Tested the (new) -p option with f2fs (and also with ext4)
ensuring that it works with the former and exits gracefully with
error in the latter cases.
Bug:
63939317
Change-Id: I2a3ad02a650a293dbca4c23d0276bbe86ad648fe
Signed-off-by: Mohan Srinivasan <srmohan@google.com>
Treehugger Robot [Thu, 14 Sep 2017 17:30:43 +0000 (17:30 +0000)]
Merge "simpleperf: fix report_sample_test." into oreo-cts-dev
Yabin Cui [Thu, 14 Sep 2017 06:39:15 +0000 (06:39 +0000)]
simpleperf: Omit dwarf-callgraph tests running on arm translation tools.
am:
3035e41eb6 -s ours
Change-Id: Ideeca0820befd88dde17dd499db618f0d23aeb36
Justin Yun [Thu, 14 Sep 2017 06:14:50 +0000 (06:14 +0000)]
Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am:
6f9b64076a am:
ed1878c15b
am:
a7fcb39a5b -s ours
Change-Id: Id84d48eab239f3fc4b102d86deb232793f937104
Yabin Cui [Thu, 14 Sep 2017 06:14:31 +0000 (06:14 +0000)]
Merge "simpleperf: Omit dwarf-callgraph tests running on arm translation tools." am:
1486c2cb07 am:
ce64ec96a3
am:
0ebafd2f16
Change-Id: I82bd1808b45b558cd12cc6064ae64a20376f7066
Justin Yun [Thu, 14 Sep 2017 05:49:15 +0000 (05:49 +0000)]
Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am:
6f9b64076a
am:
ed1878c15b
Change-Id: I313ddcb7532f66e787f8c517f75849ca1542259d
Yabin Cui [Thu, 14 Sep 2017 05:48:56 +0000 (05:48 +0000)]
Merge "simpleperf: Omit dwarf-callgraph tests running on arm translation tools." am:
1486c2cb07
am:
ce64ec96a3
Change-Id: I223c88679614c8e65ece5cf9bd61882c2c1b9e89
Justin Yun [Thu, 14 Sep 2017 05:22:25 +0000 (05:22 +0000)]
Merge "Mark the module as VNDK or VNDK-SP in Android.bp"
am:
6f9b64076a
Change-Id: Idc3ff00540eac3f6755ebbda162db57160753c75
Yabin Cui [Thu, 14 Sep 2017 05:22:08 +0000 (05:22 +0000)]
Merge "simpleperf: Omit dwarf-callgraph tests running on arm translation tools."
am:
1486c2cb07
Change-Id: I55efc3b160b62345742ab17874ae9d9dfca4bb1b
Yabin Cui [Wed, 13 Sep 2017 20:21:32 +0000 (13:21 -0700)]
simpleperf: Omit dwarf-callgraph tests running on arm translation tools.
Bug: http://b/
64946809
Bug:
64709603 (presubmit balking at the line above)
Test: run arm CtsSimpleperfTestCases32 on fugu.
Change-Id: I76ee44b8fd2a6022cbef32392ee0336fe4d14ade
(cherry picked from commit
64a9ecda2c006f90dcc047ad95be792139622ead)
Jin Qian [Thu, 14 Sep 2017 03:37:10 +0000 (03:37 +0000)]
ext4_utils: fix off-by-one error when free blocks
am:
98e4272576
Change-Id: I85bf700d37794bf84188790d92c1199555a13452
Treehugger Robot [Thu, 14 Sep 2017 01:59:30 +0000 (01:59 +0000)]
Merge "Mark the module as VNDK or VNDK-SP in Android.bp"
Treehugger Robot [Thu, 14 Sep 2017 01:45:39 +0000 (01:45 +0000)]
Merge "simpleperf: Omit dwarf-callgraph tests running on arm translation tools."
Yabin Cui [Mon, 15 May 2017 20:39:36 +0000 (13:39 -0700)]
simpleperf: fix report_sample_test.
When running cmd_report_sample.* tests, it may call
ReportSampleCmd()->Run() more than once. If we shutdown
protobuf library in one call, using protobuf in the
following calls will encounter failures.
Bug: http://b/
37996565
Test: run CtsSimpleperfTestCases.
Change-Id: I5ca217406e786645d45fda518055c4a63ab3db3c
(cherry picked from commit
b3675a5db81d02b07b92f8f13d37187a9cb4890c)
Yabin Cui [Wed, 13 Sep 2017 20:21:32 +0000 (13:21 -0700)]
simpleperf: Omit dwarf-callgraph tests running on arm translation tools.
Bug: http://b/
64946809
Test: run arm CtsSimpleperfTestCases32 on fugu.
Change-Id: I76ee44b8fd2a6022cbef32392ee0336fe4d14ade
Ting-Yuan Huang [Tue, 29 Aug 2017 23:05:31 +0000 (16:05 -0700)]
Fix reduce_allocation().
alloc->list.last was repeatedly freed.
Test: built without seeing warnings.
Change-Id: Ia8b2f9d4b8ba9fbe13fae5d7a0a4d526ddc863d6
Jin Qian [Fri, 8 Sep 2017 00:09:45 +0000 (17:09 -0700)]
ext4_utils: fix off-by-one error when free blocks
block points at one block before the region we wanted to free after
the loop that updats bitmap. This causes the code to free chunk still
being used.
Bug:
35262536
Test: lunch angler-userdebug; m dist
Test: lunch bullhead-userdebug; m dist
Change-Id: I7ebb30f4c7bcd01d3213ae0804a026a5ad98072c
(cherry picked from commit
a4ed4e10e98b0efa4e259c99e84609bebb08cd66)
Elliott Hughes [Fri, 8 Sep 2017 17:38:32 +0000 (17:38 +0000)]
Merge "<stdbool.h> not necessary in C++." am:
390c1a849e am:
f2cfcb12ca
am:
234229671c
Change-Id: I148d0e409d726a20379c119294bcf69feac54c8a
Elliott Hughes [Fri, 8 Sep 2017 17:36:58 +0000 (17:36 +0000)]
Merge "<stdbool.h> not necessary in C++." am:
390c1a849e
am:
f2cfcb12ca
Change-Id: I4e1cfb2241a05a3bc894252fda5a341e4bd91270
Elliott Hughes [Fri, 8 Sep 2017 17:35:28 +0000 (17:35 +0000)]
Merge "<stdbool.h> not necessary in C++."
am:
390c1a849e
Change-Id: I6650c34ff30aeec00dd28396f7fbe5ed3eb9c5c9
Elliott Hughes [Fri, 8 Sep 2017 17:31:58 +0000 (17:31 +0000)]
Merge "<stdbool.h> not necessary in C++."
Elliott Hughes [Thu, 7 Sep 2017 20:34:03 +0000 (13:34 -0700)]
<stdbool.h> not necessary in C++.
Bug: N/A
Test: builds
Change-Id: I02c2619bd5ddcabf19b0fea6845e2ffbe9c9edf6
Justin Yun [Mon, 24 Jul 2017 06:19:45 +0000 (15:19 +0900)]
Mark the module as VNDK or VNDK-SP in Android.bp
As a VNDK/VNDK-SP module, Android.bp must have 'vndk' tag as well
as 'vendor_available: true'.
For a VNDK module, the 'vndk' tag has 'enabled: true'.
It will be installed system/lib(64)/vndk as a vendor variant.
For a VNDK-SP module, the 'vndk' tag has
'support_system_process: true' as well as 'enabled: true'.
It will be installed system/lib(64)/vndk-sp as a vendor variant.
Bug:
63866913
Test: build and boot with BOARD_VNDK_VERSION=current
Merged-In: I7a2eaf4894188d4d300fcc78380a2b05517c54f4
Change-Id: I7a2eaf4894188d4d300fcc78380a2b05517c54f4
(cherry picked from commit
953341705abd2a840b464928d9ce56e0c1f37b25)
Manoj Gupta [Tue, 5 Sep 2017 23:35:17 +0000 (16:35 -0700)]
Fix clang static analyzer warnings
Fix the following warnings:
system/extras/librank/librank.c:422:12: warning: Potential leak of
memory pointed to by 'pi' [clang-analyzer-unix.Malloc]
system/extras/librank/librank.c:137:29: warning: Call to 'realloc' has
an allocation size of 0 bytes [clang-analyzer-unix.API]
system/extras/librank/librank.c:95:21: warning: Call to 'realloc' has an
allocation size of 0 bytes [clang-analyzer-unix.API]
The memory leak is real but we don't care about memory leaks when exiting
main. So just replace return by exit to silence the analyzer.
Bug: b/
27101951
Test:Warnings are gone.
Change-Id: I9af4ec4a4b740f5edcf9390b30a16b95d76e6a20
Yabin Cui [Tue, 5 Sep 2017 22:31:34 +0000 (22:31 +0000)]
Merge "simpleperf: support --clockid option in record cmd." am:
41e392642f am:
1cad85ba22
am:
6e63a5cc58
Change-Id: I5fa335fd642afd1666e762eb9d7913cd997ed2aa
Yabin Cui [Tue, 5 Sep 2017 22:27:05 +0000 (22:27 +0000)]
Merge "simpleperf: support --clockid option in record cmd." am:
41e392642f
am:
1cad85ba22
Change-Id: Iec74a85c408fff23105212260a4fc0d439f41d2f
Yabin Cui [Tue, 5 Sep 2017 22:24:04 +0000 (22:24 +0000)]
Merge "simpleperf: support --clockid option in record cmd."
am:
41e392642f
Change-Id: Ibaad342c2b420eef59601a69fcfbeca51c3d1ac5
Yabin Cui [Tue, 5 Sep 2017 22:17:56 +0000 (22:17 +0000)]
Merge "simpleperf: support --clockid option in record cmd."
Yabin Cui [Fri, 1 Sep 2017 22:40:41 +0000 (15:40 -0700)]
simpleperf: support --clockid option in record cmd.
Setting clockid is supported in kernel 4.x.
Whether it is supported by the kernel can be checked
via `simpleperf list --show-features`.
Bug: http://b/
65214671
Test: run simpleperf_unit_test.
Change-Id: I6f312cc62893af0fa5092ed91434b6df46435d7f
Yabin Cui [Fri, 1 Sep 2017 22:30:53 +0000 (22:30 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
4312148." am:
c01804d628 am:
fd80a8e536
am:
5a6d737d53
Change-Id: I826bbd00cb9f2613cc549b892cb4e821e4e06df3
Yabin Cui [Fri, 1 Sep 2017 22:03:18 +0000 (22:03 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
4312148." am:
c01804d628
am:
fd80a8e536
Change-Id: Id1465ec327d6219ca9bb78264cd6a4fd9830c732
Yabin Cui [Fri, 1 Sep 2017 21:49:42 +0000 (21:49 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
4312148."
am:
c01804d628
Change-Id: Icef7d41a072ea8e16c934f81b223badb58e9bf30
Yabin Cui [Fri, 1 Sep 2017 21:28:10 +0000 (21:28 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
4312148."
Yabin Cui [Fri, 1 Sep 2017 18:30:40 +0000 (11:30 -0700)]
simpleperf: update simpleperf prebuilts to build
4312148.
Taken from branch aosp-master.
Bug: http://b/
65025325
Test: run test.py.
Change-Id: Ifa1b8620c47d3448a8924447371bf74461f97fb0
Yabin Cui [Thu, 31 Aug 2017 17:24:34 +0000 (17:24 +0000)]
Merge "simpleperf: fix --app option for multiprocess apps." am:
5324d11761 am:
25ae641a7d
am:
09fcf7d9dc
Change-Id: I2fb90408e7c73a2a68f2b7af539edfe559822327
Yabin Cui [Thu, 31 Aug 2017 17:19:35 +0000 (17:19 +0000)]
Merge "simpleperf: fix --app option for multiprocess apps." am:
5324d11761
am:
25ae641a7d
Change-Id: Idd747b7f4f8cb77f43892e484ca2e8516493dc88
Yabin Cui [Thu, 31 Aug 2017 17:03:34 +0000 (17:03 +0000)]
Merge "simpleperf: fix --app option for multiprocess apps."
am:
5324d11761
Change-Id: I47fb7b496b91d7b17fe6450c6795485de965e1db
Yabin Cui [Thu, 31 Aug 2017 16:52:39 +0000 (16:52 +0000)]
Merge "simpleperf: fix --app option for multiprocess apps."
Yunlian Jiang [Wed, 30 Aug 2017 19:13:36 +0000 (19:13 +0000)]
Merge "fix memory leak in unittest." am:
d9ea298022 am:
607a669016
am:
7479ae94e0
Change-Id: I46602c43fe55c92fd109fd325648d1cb6ca6ba49
Yunlian Jiang [Wed, 30 Aug 2017 19:06:35 +0000 (19:06 +0000)]
Merge "fix memory leak in unittest." am:
d9ea298022
am:
607a669016
Change-Id: I4dbfad16a2626c39f349a3be406ea75d2e845b9e
Yunlian Jiang [Wed, 30 Aug 2017 19:01:05 +0000 (19:01 +0000)]
Merge "fix memory leak in unittest."
am:
d9ea298022
Change-Id: Ice30391dfa5352ca12eff79ca888febe87aa63ae
Treehugger Robot [Wed, 30 Aug 2017 18:51:33 +0000 (18:51 +0000)]
Merge "fix memory leak in unittest."
Yunlian Jiang [Wed, 30 Aug 2017 16:50:05 +0000 (09:50 -0700)]
fix memory leak in unittest.
This fixes the warning
warning: Potential leak of memory pointed to by 'salt' [clang-analyzer-cplusplus.NewDeleteLeaks]
Bug: None
Test: The warning is gone.
Change-Id: I1a31188775c2a099949bf8b8e2613b71af5081cd
Sherry Yang [Wed, 30 Aug 2017 04:01:41 +0000 (04:01 +0000)]
Merge "Memory pressure" am:
c7d0028ac2 am:
a4e7af5980
am:
08fb4b606a
Change-Id: I195f028ca2f394ae0253b946a9af8b702b0e1d18
Sherry Yang [Wed, 30 Aug 2017 03:55:11 +0000 (03:55 +0000)]
Merge "Memory pressure" am:
c7d0028ac2
am:
a4e7af5980
Change-Id: Ic35727f6c6fcc5e9c7c1c6b9646e77a6a9bfee56
Sherry Yang [Wed, 30 Aug 2017 03:48:40 +0000 (03:48 +0000)]
Merge "Memory pressure"
am:
c7d0028ac2
Change-Id: I9d32b1c5233158411f55542402353c5802077402
Treehugger Robot [Wed, 30 Aug 2017 03:32:35 +0000 (03:32 +0000)]
Merge "Memory pressure"
Yabin Cui [Mon, 28 Aug 2017 21:49:04 +0000 (14:49 -0700)]
simpleperf: fix --app option for multiprocess apps.
1. Search all processes in an app when using --app option in record command.
2. Fix searching one app process when using -p option in app_profiler.py.
3. Add unittest for profiling multiprocess apps.
Bug: http://b/
65025325
Test: run test.py
Change-Id: Iba2e97c2174815d0236636e3cf15b1fc17a5d838
Yabin Cui [Tue, 29 Aug 2017 16:42:57 +0000 (16:42 +0000)]
Merge "simpleperf: fix finding app's process." am:
5c4dcdb68d am:
3919e31d85
am:
d2c98f9fad
Change-Id: I8ef1130032231d6fd337cf64748dbcd9f91c6e77
Yabin Cui [Tue, 29 Aug 2017 16:36:56 +0000 (16:36 +0000)]
Merge "simpleperf: fix finding app's process." am:
5c4dcdb68d
am:
3919e31d85
Change-Id: I5d6988b6ca53afb7a386c15c93c4def724d4a6cd
Yabin Cui [Tue, 29 Aug 2017 16:30:26 +0000 (16:30 +0000)]
Merge "simpleperf: fix finding app's process."
am:
5c4dcdb68d
Change-Id: If04548d4040db0f37f6851465d96ee97a4e0264a
Yabin Cui [Tue, 29 Aug 2017 16:22:28 +0000 (16:22 +0000)]
Merge "simpleperf: fix finding app's process."
Yabin Cui [Mon, 28 Aug 2017 22:49:33 +0000 (15:49 -0700)]
simpleperf: fix finding app's process.
Also check the return value of recording, fix some tiny errors in tests.
Bug: None.
Test: run test.py.
Change-Id: I42b33c796a302b71ca1c87888b4a2e9ad53306af
Jin Qian [Mon, 28 Aug 2017 22:57:02 +0000 (22:57 +0000)]
Merge "ext4_utils: skip symbolic links in basefs file" into oc-mr1-dev
am:
0a26d1b893
Change-Id: Iaa957a7f58871a23304511f175ef35c3da800c2b
TreeHugger Robot [Mon, 28 Aug 2017 22:33:49 +0000 (22:33 +0000)]
Merge "ext4_utils: skip symbolic links in basefs file" into oc-mr1-dev
Yabin Cui [Mon, 28 Aug 2017 21:02:12 +0000 (21:02 +0000)]
simpleperf: fix check of opening perf event files.
am:
16006b9403
Change-Id: I57c1cf588eb0df539d1ec359533d9933edde7af1
Jin Qian [Mon, 28 Aug 2017 19:38:39 +0000 (12:38 -0700)]
ext4_utils: skip symbolic links in basefs file
base_fs uses actual file size instead of size of symlink itself to
reserve data blocks. This caused extra data blocks to be reserved
and failed e2fsck.
Bug:
35262536
Change-Id: I0e9b0cc99a0f9a33596928b01468426fc2d34ab0
Yabin Cui [Fri, 25 Aug 2017 18:17:45 +0000 (11:17 -0700)]
simpleperf: fix check of opening perf event files.
When asked to monitor a process, record/stat cmd checks if we can
open perf event files for all threads successfully. However, it
fails when the monitored process has an exiting thread. This makes
record_cmd.duration_option test flakey, when there are exiting
threads in other tests, like record_cmd.handle_SIGHUP.
To fix this, only check if we can open perf event files for at
least one thread for each monitored process.
Bug: http://b/
65047463
Bug:
64709603 (presubmit balking at the line above)
Test: run CtsSimpleperfTestCases.
Change-Id: Ia02ed498f49c9c6c452023ad31abb01a58071152
(cherry picked from commit
b3ae56e485b4d971a909a8b04da65713a3d56872)
Sherry Yang [Sat, 26 Aug 2017 02:05:50 +0000 (19:05 -0700)]
Memory pressure
Create continuous memory pressure by adjusting
a child process's oom score and allocate in
the child. When a child is killed by
the low-memory-killer, fork another process and
continues until the program is killed or certain
number of iterations has reached.
Bug:
63926541
Test: run mem-pressure on target
Change-Id: Ic8ee60da7519c750de4bd690f26e31fa80c5cd49
Paul Crowley [Fri, 25 Aug 2017 22:40:15 +0000 (22:40 +0000)]
Merge "Try to encrypt /data/media/obb but ignore failures" into oc-mr1-dev
am:
eb29dced71
Change-Id: I561e352eadaa7ea975eb305b5d24e27bef337e51
TreeHugger Robot [Fri, 25 Aug 2017 22:33:27 +0000 (22:33 +0000)]
Merge "Try to encrypt /data/media/obb but ignore failures" into oc-mr1-dev
Yabin Cui [Fri, 25 Aug 2017 21:46:43 +0000 (21:46 +0000)]
Merge "simpleperf: fix check of opening perf event files." am:
14f2ee3581 am:
2ab054b3ad
am:
87adc5c4d2
Change-Id: Ia51655b7051c2a5809c885c0269a04c4b1dc4d35
Yabin Cui [Fri, 25 Aug 2017 21:39:12 +0000 (21:39 +0000)]
Merge "simpleperf: fix check of opening perf event files." am:
14f2ee3581
am:
2ab054b3ad
Change-Id: I89d73b3569ce0b5d9a08afab3d30c976ecc79dc0
Yabin Cui [Fri, 25 Aug 2017 21:35:15 +0000 (21:35 +0000)]
Merge "simpleperf: fix check of opening perf event files."
am:
14f2ee3581
Change-Id: Ie331a523437a77dfb8068f8ddf9cf622a10fcc3c
Yabin Cui [Fri, 25 Aug 2017 21:20:18 +0000 (21:20 +0000)]
Merge "simpleperf: fix check of opening perf event files."
Yabin Cui [Fri, 25 Aug 2017 18:17:45 +0000 (11:17 -0700)]
simpleperf: fix check of opening perf event files.
When asked to monitor a process, record/stat cmd checks if we can
open perf event files for all threads successfully. However, it
fails when the monitored process has an exiting thread. This makes
record_cmd.duration_option test flakey, when there are exiting
threads in other tests, like record_cmd.handle_SIGHUP.
To fix this, only check if we can open perf event files for at
least one thread for each monitored process.
Bug: http://b/
65047463
Test: run CtsSimpleperfTestCases.
Change-Id: Ia02ed498f49c9c6c452023ad31abb01a58071152
Pavlin Radoslavov [Thu, 24 Aug 2017 08:21:52 +0000 (08:21 +0000)]
Add missing libdl dependencies
am:
36e33dd549 -s ours
Change-Id: Ib56efa6293b428b690de75ed92c1aac84a85114b
Pavlin Radoslavov [Wed, 23 Aug 2017 22:04:39 +0000 (15:04 -0700)]
Add missing libdl dependencies
Bug:
62815515
Test: lunch full-eng; make checkbuild
Merged-In: Iad3cf98d7c9e659ee517caf352613334215ea397
Change-Id: Iad3cf98d7c9e659ee517caf352613334215ea397
(cherry picked from commit
63562198ec26233ab48b22ee0b436e731f52bba0)
Pavlin Radoslavov [Wed, 23 Aug 2017 23:48:11 +0000 (23:48 +0000)]
Merge "Add missing libdl dependencies" am:
c7d0f96ab4 am:
9971517f9c
am:
1104418d25
Change-Id: Ibbc47f58e5629dcedfcb07e853d949d38633344d
Pavlin Radoslavov [Wed, 23 Aug 2017 23:44:20 +0000 (23:44 +0000)]
Merge "Add missing libdl dependencies" am:
c7d0f96ab4
am:
9971517f9c
Change-Id: I36643e0e991e10ca0dbedb7fd7d700013454ea2b
Pavlin Radoslavov [Wed, 23 Aug 2017 23:40:07 +0000 (23:40 +0000)]
Merge "Add missing libdl dependencies"
am:
c7d0f96ab4
Change-Id: Ifacb48d2da671bbde09b2a2a4ab38e246fb89a3e
Pavlin Radoslavov [Wed, 23 Aug 2017 23:31:35 +0000 (23:31 +0000)]
Merge "Add missing libdl dependencies"
Pavlin Radoslavov [Wed, 23 Aug 2017 22:04:39 +0000 (15:04 -0700)]
Add missing libdl dependencies
Bug:
62815515
Test: lunch full-eng; make checkbuild
Change-Id: Iad3cf98d7c9e659ee517caf352613334215ea397
Alex Light [Wed, 23 Aug 2017 19:53:51 +0000 (19:53 +0000)]
Merge "Make cppreopts cleanup if it fails" am:
9711713241 am:
ac9b39c5ed
am:
aed88af8ff
Change-Id: I974bac16ffe6b1963defd3af8ffaf28152d53ff0
Alex Light [Wed, 23 Aug 2017 19:49:49 +0000 (19:49 +0000)]
Merge "Make cppreopts cleanup if it fails" am:
9711713241
am:
ac9b39c5ed
Change-Id: Iaff3d835bc30e5434d0f075293fdb48060edb3e2
Alex Light [Wed, 23 Aug 2017 19:46:56 +0000 (19:46 +0000)]
Merge "Make cppreopts cleanup if it fails"
am:
9711713241
Change-Id: Icd8077bdead31ca50ba41b4c426142d438d0239c
Treehugger Robot [Wed, 23 Aug 2017 19:39:41 +0000 (19:39 +0000)]
Merge "Make cppreopts cleanup if it fails"
Alex Light [Tue, 25 Jul 2017 18:17:05 +0000 (11:17 -0700)]
Make cppreopts cleanup if it fails
Previously we would simply leave temporary files lying around if we
failed to rename them for some reason. This change makes us attempt to
clean the temporary files up.
Test: Phone boots.
Bug:
63995897
Change-Id: Ib876a626904bec090fe4f3bd228335feadb6a7c7
Yabin Cui [Tue, 22 Aug 2017 01:40:00 +0000 (01:40 +0000)]
Merge "simpleperf: improve test.py." am:
12bc7ee848 am:
005fc035cb am:
3f5f725466
am:
715a32d7cf
Change-Id: I9d0be3095839f31089f5f75e8641ea2f8bb89abe
Yabin Cui [Tue, 22 Aug 2017 01:34:28 +0000 (01:34 +0000)]
Merge "simpleperf: improve test.py." am:
12bc7ee848 am:
005fc035cb
am:
3f5f725466
Change-Id: Ie2068adc6d8e06ab0bb1c99d2b3bbb9ac42bc11a
Yabin Cui [Tue, 22 Aug 2017 01:28:29 +0000 (01:28 +0000)]
Merge "simpleperf: improve test.py." am:
12bc7ee848
am:
005fc035cb
Change-Id: I1dfb939e095e1eb176984306262018cabe4915b3