OSDN Git Service
David Anderson [Wed, 18 Dec 2019 16:03:03 +0000 (08:03 -0800)]
Merge "partition_tools: Add support for the VIRTUAL_AB_DEVICE flag."
am:
ca98e449a9
Change-Id: Id822e04a596ef5f84c954e2315aa82fbf193eec9
David Anderson [Wed, 18 Dec 2019 15:42:44 +0000 (15:42 +0000)]
Merge "partition_tools: Add support for the VIRTUAL_AB_DEVICE flag."
Eric Biggers [Tue, 17 Dec 2019 17:41:44 +0000 (09:41 -0800)]
Merge "libfscrypt: Use <linux/fscrypt.h> from Bionic"
am:
b577ab32de
Change-Id: Ib47499363e48552148c8038a09f2d232506a2cf1
Greg Kaiser [Tue, 17 Dec 2019 17:41:18 +0000 (09:41 -0800)]
Merge "lpdump: Use unsigned value for shift"
am:
2fbd5d87b2
Change-Id: I911e9b35b991216c9aacf93901bf49a518ef0a1e
Eric Biggers [Tue, 17 Dec 2019 17:35:39 +0000 (17:35 +0000)]
Merge "libfscrypt: Use <linux/fscrypt.h> from Bionic"
Treehugger Robot [Tue, 17 Dec 2019 17:34:27 +0000 (17:34 +0000)]
Merge "lpdump: Use unsigned value for shift"
Greg Kaiser [Tue, 17 Dec 2019 13:43:47 +0000 (05:43 -0800)]
lpdump: Use unsigned value for shift
Shifting a signed 32-bit value by 31 bits is implementation-defined
behavior. While our toolchains are most probably doing the
expected thing, we make this an unsigned value out of paranoia.
Test: TreeHugger
Change-Id: I551fcf1ac7a27ebd7c1365cd6a9df7267f569c44
Eric Biggers [Tue, 17 Dec 2019 00:02:23 +0000 (16:02 -0800)]
libfscrypt: Use <linux/fscrypt.h> from Bionic
aosp/
1184798 has updated the kernel headers to android-mainline, so we
no longer need to manually declare the declarations for v2 policies, nor
do we need to manually declare FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64.
Also replace the FS_* constants with their new FSCRYPT_* names. This
doesn't change the numerical values; it just changes the names.
Test: build and 'atest libfscrypt_unit_test'
Bug: None
Change-Id: I03ce177923bfa9e0fecbbdbf1718fbf1c17176d9
David Anderson [Mon, 16 Dec 2019 20:39:00 +0000 (12:39 -0800)]
Merge "lpmake: Use an enum class for option codes."
am:
35692b0400
Change-Id: I23a6b3243808ac6cae79b4b6af068bf0a4ce7799
David Anderson [Mon, 16 Dec 2019 20:31:06 +0000 (20:31 +0000)]
Merge "lpmake: Use an enum class for option codes."
David Anderson [Mon, 16 Dec 2019 17:42:07 +0000 (09:42 -0800)]
Merge "lpdump: Add support for the metadata flags field."
am:
d2290d8d36
Change-Id: Ibf87f5727adb95f01a0b7370316758c1d43826a8
David Anderson [Mon, 16 Dec 2019 17:31:57 +0000 (17:31 +0000)]
Merge "lpdump: Add support for the metadata flags field."
David Anderson [Fri, 13 Dec 2019 23:34:54 +0000 (15:34 -0800)]
partition_tools: Add support for the VIRTUAL_AB_DEVICE flag.
Bug:
134949511
Test: manual test
Change-Id: If31234d9da0b15a3dbde7dcc835b2161c5dbba61
David Anderson [Fri, 13 Dec 2019 23:31:10 +0000 (15:31 -0800)]
lpmake: Use an enum class for option codes.
There's no reason to have short-form option codes for everything, this
will make that more clear.
Bug:
134949511
Test: super.img builds
Change-Id: If60f6648ac311b77d68768bb39825d01c663c500
David Anderson [Fri, 13 Dec 2019 01:12:27 +0000 (17:12 -0800)]
lpdump: Add support for the metadata flags field.
Bug:
134949511
Test: manual test
Change-Id: Iafc5193c71315b14f192fcc0ae42188a51b0d2cb
Yabin Cui [Thu, 12 Dec 2019 06:02:43 +0000 (22:02 -0800)]
Merge "simpleperf: fix reading jit debug descriptors."
am:
018adfb818
Change-Id: I22b3ed631d4d89ae10844751a89f2a9f63193a4a
Yabin Cui [Thu, 12 Dec 2019 05:25:14 +0000 (05:25 +0000)]
Merge "simpleperf: fix reading jit debug descriptors."
Yabin Cui [Thu, 12 Dec 2019 00:50:24 +0000 (16:50 -0800)]
simpleperf: fix reading jit debug descriptors.
Clang may generate elf files with segments not starting from
page-aligned addresses. For these segments, dynamic linker
creates maps mapping to (segment.p_offset & PAGE_MASK). So
map.start is mapped to file vaddr (segment.p_vaddr & PAGE_MASK)
instead of segment.p_vaddr.
So add PAGE_MASK when calculating memory address of descriptors,
using below formula:
descriptor.vaddr_in_file - (segment.p_vaddr & PAGE_MASK) + map.start.
Bug:
145920143
Bug:
145930241
Test: run simpleperf_unit_test.
Change-Id: Id185a6d6b766ecaa30b5067664687e556f92ef27
Christopher Ferris [Tue, 10 Dec 2019 23:03:40 +0000 (15:03 -0800)]
Merge "Add no decay variants of benchmarks."
am:
d2e2e2d875
Change-Id: I05a5bce97fc7af65f0a6b5a674d33cd3462507e2
Christopher Ferris [Tue, 10 Dec 2019 22:50:18 +0000 (22:50 +0000)]
Merge "Add no decay variants of benchmarks."
Christopher Ferris [Tue, 10 Dec 2019 21:19:43 +0000 (13:19 -0800)]
Add no decay variants of benchmarks.
This will help to tell what the performance impact is of turning
off the decay timer.
Test: Ran benchmarks and verified that times are slower for no decay.
Change-Id: Ia0d5aa879e92fb0790194c2efada6c2e407427a9
Tianjie Xu [Wed, 4 Dec 2019 23:11:27 +0000 (15:11 -0800)]
Merge "Factor out the hashtree info from the verity_info"
am:
d4c448cb15
Change-Id: Icd9aade468c32d64a0482f2e050bd95f9e3ea25a
Tianjie Xu [Wed, 4 Dec 2019 23:07:23 +0000 (23:07 +0000)]
Merge "Factor out the hashtree info from the verity_info"
Alistair Delva [Mon, 2 Dec 2019 22:06:45 +0000 (14:06 -0800)]
Merge "mkf2fsuserimg.sh: Make sparse mode optional"
am:
8b724d9075
Change-Id: Ic040444e05471954247abd688054c79544ac427c
Alistair Delva [Mon, 2 Dec 2019 21:54:20 +0000 (21:54 +0000)]
Merge "mkf2fsuserimg.sh: Make sparse mode optional"
Tianjie Xu [Wed, 20 Nov 2019 20:18:40 +0000 (12:18 -0800)]
Factor out the hashtree info from the verity_info
Even though the format for the VB2.0(AVB) image is different from the VB1.0
image, the majority of the content is the same. In specific, they both
have a hashtree and ecc data. By factoring the hashtree info, fec_read
can later use only the hashtree for error correction and doesn't need to
have the knowledge of verity format.
VB 1.0:
Filesystem
hash_tree
metadata <- assume 8 blocks
ecc_data
VB 2.0:
Filesystem
hash_tree
ecc_data
vbmeta
avb footer
Also switch the internal struct to use std containers so that we don't
need to worry about the memory management.
Bug:
144388532
Test: load a verity image, unit tests pass
Change-Id: I83c55464c3ac75ac41be9f507b674886ad298350
David Anderson [Mon, 25 Nov 2019 20:24:12 +0000 (12:24 -0800)]
Merge "partition_tools: Add an "lpadd" tool for appending images to super.img."
am:
cf9b34eccd
Change-Id: I4fc759fba2d489aee3bdf2870434d904f614e1e8
David Anderson [Mon, 25 Nov 2019 20:17:19 +0000 (20:17 +0000)]
Merge "partition_tools: Add an "lpadd" tool for appending images to super.img."
Yabin Cui [Fri, 22 Nov 2019 20:23:41 +0000 (12:23 -0800)]
Merge "simpleperf: fix flaky test TestApiProfiler."
am:
184821b4f0
Change-Id: Id953ebb3cfbebeaff09e837c1c084565820ad0fb
Yabin Cui [Fri, 22 Nov 2019 20:23:12 +0000 (12:23 -0800)]
Merge "simpleperf: update simpleperf prebuilts to build
6021660."
am:
b17755fb7d
Change-Id: Ib5f29fe15f21a8dadde3da69d2e6a2c680e6f151
Yabin Cui [Fri, 22 Nov 2019 20:14:19 +0000 (20:14 +0000)]
Merge "simpleperf: fix flaky test TestApiProfiler."
Yabin Cui [Fri, 22 Nov 2019 20:13:41 +0000 (20:13 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
6021660."
Yabin Cui [Fri, 22 Nov 2019 00:06:24 +0000 (16:06 -0800)]
simpleperf: fix flaky test TestApiProfiler.
Bug: none
Test: run test.py TestApiProfiler* --repeat 10.
Change-Id: I5829aa9b2be8057b64130a6fb4b076958456c7ca
Yabin Cui [Wed, 20 Nov 2019 23:26:06 +0000 (15:26 -0800)]
simpleperf: update simpleperf prebuilts to build
6021660.
Taken from branch aosp-simpleperf-release.
Bug: none
Test: run test.py on devices with different android versions.
Change-Id: I39c33e6f7c1d3776288db78554feafea0bff959f
David Anderson [Thu, 21 Nov 2019 21:48:53 +0000 (13:48 -0800)]
Merge "lpdumpd: Do not use stack to store arguments."
am:
46038c2002
Change-Id: If7616927d6c970851458139906e0cbe9f9784dbd
David Anderson [Thu, 21 Nov 2019 21:39:28 +0000 (21:39 +0000)]
Merge "lpdumpd: Do not use stack to store arguments."
David Anderson [Thu, 21 Nov 2019 20:32:23 +0000 (12:32 -0800)]
Merge "lpdump: When using -h, print usage to stdout so lpdumpd prints it."
am:
2e61a7758c
Change-Id: I9698754f5f0379db8310fb7d2ad2fca6d07e83b7
David Anderson [Thu, 21 Nov 2019 20:18:05 +0000 (20:18 +0000)]
Merge "lpdump: When using -h, print usage to stdout so lpdumpd prints it."
Cody Caldwell [Wed, 20 Nov 2019 20:56:16 +0000 (12:56 -0800)]
Merge "Revert "lpmake: Don't assume a device is retrofit if it has one block device for super.""
am:
cafb6e9140
Change-Id: Iae536a2eaef715a899bd97ccf1645541a520376f
Cody Caldwell [Wed, 20 Nov 2019 20:40:30 +0000 (20:40 +0000)]
Merge "Revert "lpmake: Don't assume a device is retrofit if it has one block device for super.""
Cody Caldwell [Wed, 20 Nov 2019 20:36:12 +0000 (20:36 +0000)]
Revert "lpmake: Don't assume a device is retrofit if it has one block device for super."
This reverts commit
13945230d36282a0dd2ad7c240f2b88ffc506205.
Reason for revert: Potential culprit for Bug b/
144809373 - verifying through Forrest before revert submission
Change-Id: Ic4ed750a5386f6f45a871ac7112142a6991dfd2c
David Anderson [Wed, 20 Nov 2019 01:04:39 +0000 (17:04 -0800)]
lpdumpd: Do not use stack to store arguments.
Bug:
144052321
Test: manual test
Change-Id: I700e22ef5c6c0a0c6a5f05c5bb4ea29b0077b34e
David Anderson [Mon, 18 Nov 2019 23:07:45 +0000 (15:07 -0800)]
partition_tools: Add an "lpadd" tool for appending images to super.img.
Syntax: lpadd [--readonly] SUPER_FILE PART_NAME GROUP_NAME [IMAGE_FILE]
The super file can be sparsed, unsparsed, or a "super_empty" image. The
source image can either be sparsed or unsparsed as well. The named
partition cannot already exist.
Usage is further described in README.md.
Bug:
144468779
Test: lpadd unsparsed super.img w/ sparsed partition
lpadd unsparsed super.img w/ unsparsed partition
lpadd sparsed super.img w/ sparsed partition
lpadd sparsed super.img w/ unsparsed partition
lpadd super_empty.img
Change-Id: I0cb5d4432c86689567f2a58a379be0f96b64a88d
David Anderson [Wed, 20 Nov 2019 01:07:14 +0000 (17:07 -0800)]
lpdump: When using -h, print usage to stdout so lpdumpd prints it.
Bug: N/A
Test: lpdump -h
Change-Id: I7bad9f8b5d5c14b831e42d1f21fe8bfeccba3fb0
David Anderson [Wed, 20 Nov 2019 00:20:12 +0000 (16:20 -0800)]
Merge "lpmake: Don't assume a device is retrofit if it has one block device for super."
am:
c42dc84680
Change-Id: I405f154ba371488182a2dd5ca16923a694263e4a
David Anderson [Wed, 20 Nov 2019 00:10:37 +0000 (00:10 +0000)]
Merge "lpmake: Don't assume a device is retrofit if it has one block device for super."
Yabin Cui [Tue, 19 Nov 2019 19:31:12 +0000 (11:31 -0800)]
Merge "simpleperf: support libraries without build ids when recording."
am:
75381635bc
Change-Id: Ibbd16734fae30741a632780b0879b40e38c8e75c
Yabin Cui [Tue, 19 Nov 2019 19:21:07 +0000 (19:21 +0000)]
Merge "simpleperf: support libraries without build ids when recording."
Yabin Cui [Tue, 19 Nov 2019 18:39:31 +0000 (10:39 -0800)]
Merge "simpleperf: exclude undefined symbols."
am:
fcdb95370b
Change-Id: If20762d78df6be06f2c5dee7ecd5e526da6c49c1
Yabin Cui [Tue, 19 Nov 2019 00:40:28 +0000 (16:40 -0800)]
simpleperf: support libraries without build ids when recording.
Simpleperf can download unstripped libraries on device and use them
for unwinding during recording, through `app_profiler.py -lib` and
`simpleperf record --symfs` options. But it doesn't support libraries
without build ids.
To support them:
1. In app_profiler.py, download libraries without build ids in native
lib dir.
2. In DebugElfFileFinder in dso.cpp, check path with the same basename
in symfs_dir.
Also add document for downloading unstripped libraries on device.
Bug: none
Test: run simpleperf_unit_test.
Test: run test.py.
Change-Id: I5d9015e683f2ecb992d425a42f1f7303307b2cea
Yabin Cui [Tue, 19 Nov 2019 18:25:36 +0000 (18:25 +0000)]
Merge "simpleperf: exclude undefined symbols."
Yabin Cui [Tue, 19 Nov 2019 01:23:27 +0000 (17:23 -0800)]
simpleperf: exclude undefined symbols.
Bug: none
Test: run simpleperf_unit_test.
Change-Id: I13c1e926d21897090103741744a7613b3f844c6a
Yabin Cui [Fri, 15 Nov 2019 23:13:38 +0000 (15:13 -0800)]
Merge "simpleperf:add MSM8909 into whitelist, omit tests requireing hw counters."
am:
3897583b73
Change-Id: I6d0ea969fd9892e5d0dc20da0385e62070d92b88
Yabin Cui [Fri, 15 Nov 2019 22:56:08 +0000 (14:56 -0800)]
Merge "simpleperf: fix build_id checking."
am:
9fe57a62ae
Change-Id: I029e3ff597fcc29a337501a4aa342651b228e527
Yabin Cui [Fri, 15 Nov 2019 22:48:20 +0000 (22:48 +0000)]
Merge "simpleperf:add MSM8909 into whitelist, omit tests requireing hw counters."
Yabin Cui [Fri, 15 Nov 2019 22:24:23 +0000 (22:24 +0000)]
Merge "simpleperf: fix build_id checking."
Yabin Cui [Thu, 14 Nov 2019 23:24:07 +0000 (15:24 -0800)]
simpleperf: fix build_id checking.
Native libraries in apks may not have build ids. So change to below
rules when looking for a debug elf file:
1) If having a build id, the build ids should match.
2) Otherwise, the debug elf file should exist and not have a build id.
Bug: none
Test: run simpleperf_unit_test.
Test: test.py.
Change-Id: I01332e3010a6df17e70c6c55e15874d43bfaeb86
pmc.waiver [Thu, 7 Nov 2019 07:54:38 +0000 (16:54 +0900)]
simpleperf:add MSM8909 into whitelist, omit tests requireing hw counters.
Test: run cts -m CtsSimpleperfTestCases -t record_cmd#generate_samples_by_hw_counters
Test: hw counters.
Bug:
144472902
(cherry picked from commit
8a0a1ebb671bed0c910d35e71bbc083a031f7331)
Change-Id: I728ea2d83c9b89fc04d442971f76293fed9099ed
Alistair Delva [Wed, 16 Oct 2019 17:40:23 +0000 (10:40 -0700)]
mkf2fsuserimg.sh: Make sparse mode optional
Bug:
142424832
Bug:
142803849
Test: Run mkf2fsuserimg.sh without the sparse option and check that the
generated image is not sparse.
Co-authored-by: Satya Tangirala <satyat@google.com>
Change-Id: I8a079b30f63ddd13a94d73339501ed8ecb2c5049
Yabin Cui [Thu, 14 Nov 2019 20:07:10 +0000 (12:07 -0800)]
Merge "simpleperf: fix failed python tests on Android O."
am:
5c96779dd0
Change-Id: I353afac69837281b59f241a7e6d0f4b9406cb604
Yabin Cui [Thu, 14 Nov 2019 19:58:33 +0000 (19:58 +0000)]
Merge "simpleperf: fix failed python tests on Android O."
Haibo Huang [Sat, 9 Nov 2019 01:02:14 +0000 (17:02 -0800)]
Merge "Fix build with new googletest"
am:
44bc03af44
Change-Id: Ieab89e84f36f9d54d11e759c49229405d56945ad
Treehugger Robot [Sat, 9 Nov 2019 00:45:33 +0000 (00:45 +0000)]
Merge "Fix build with new googletest"
Yabin Cui [Sat, 9 Nov 2019 00:04:05 +0000 (16:04 -0800)]
simpleperf: fix failed python tests on Android O.
Fix *.test_pprof_proto_generator tests by allowing elf files
not having build id.
Fix TestExamplePureJavaTraceOffCpu.test_smoke by loosing check.
Bug: none
Test: run test.py on Android O.
Change-Id: I5a796f433a56735989b90a2339765d1e70e3939f
Yabin Cui [Fri, 8 Nov 2019 22:05:12 +0000 (14:05 -0800)]
Merge "simpleperf: update simpleperf prebuilts to build
5991547."
am:
246163dac8
Change-Id: Idc4f8870c2e86f6d8a8113f99c733ebf6945ea4b
Yabin Cui [Fri, 8 Nov 2019 22:00:23 +0000 (14:00 -0800)]
Merge "simpleperf: fix test due to llvm-symbolizer upgrade."
am:
89f04a0381
Change-Id: Idb1abbbce008290462b7d8631a59bc2b64b9381c
Yabin Cui [Fri, 8 Nov 2019 21:57:37 +0000 (21:57 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
5991547."
Yabin Cui [Fri, 8 Nov 2019 21:48:09 +0000 (21:48 +0000)]
Merge "simpleperf: fix test due to llvm-symbolizer upgrade."
Yabin Cui [Fri, 8 Nov 2019 21:46:04 +0000 (13:46 -0800)]
simpleperf: fix test due to llvm-symbolizer upgrade.
Bug: none
Test: test.py *test_addr2nearestline
Change-Id: I1de1f55c25d7f9652e931a23416947ba63beb101
Yabin Cui [Thu, 7 Nov 2019 18:01:27 +0000 (10:01 -0800)]
simpleperf: update simpleperf prebuilts to build
5991547.
Taken from branch aosp-simpleperf-release.
Bug: none
Test: run test.py on flame.
Change-Id: I4e0848a9006ec24cb7b17297ebfd5d993f1aa0fd
Haibo Huang [Fri, 8 Nov 2019 20:20:22 +0000 (12:20 -0800)]
Fix build with new googletest
The new googletest requires prefix to be non-empty.
Change-Id: Iacd96a6e2fcfb2193c7627212e9e710fb655d6d9
Yabin Cui [Thu, 7 Nov 2019 00:57:31 +0000 (16:57 -0800)]
Merge "simpleperf: fix test.py on x86/x86_64."
am:
b74b2b5c11
Change-Id: I8bc33282f6eda38bccaf7e48dc25cba2000aac47
Yabin Cui [Thu, 7 Nov 2019 00:35:35 +0000 (00:35 +0000)]
Merge "simpleperf: fix test.py on x86/x86_64."
Yabin Cui [Wed, 6 Nov 2019 20:28:48 +0000 (12:28 -0800)]
simpleperf: fix test.py on x86/x86_64.
Find 32bit abi on device instead of hardcoding to arm.
Add x86/x86_64 libraries in test apks.
Bug: none
Test: run test.py on x86 emulator.
Change-Id: Ie19b8423c2dfb2260bdc4bae6313b54aaa2847ab
Yabin Cui [Wed, 6 Nov 2019 20:55:48 +0000 (12:55 -0800)]
Merge "simpleperf: allow more than one pattern in test.py."
am:
ab10d26e56
Change-Id: I982792f0fd7dea08e32b9825b3acb8c0ec07509b
Yabin Cui [Wed, 6 Nov 2019 20:35:02 +0000 (20:35 +0000)]
Merge "simpleperf: allow more than one pattern in test.py."
Yabin Cui [Wed, 6 Nov 2019 00:25:36 +0000 (16:25 -0800)]
simpleperf: allow more than one pattern in test.py.
Bug: none
Test: run test.py TestTools* TestExample*.
Change-Id: I26e0a37113044cb96c90ff8a02d7f3b34d356c19
Yabin Cui [Wed, 6 Nov 2019 19:32:21 +0000 (11:32 -0800)]
Merge "simpleperf: add browser option in test.py."
am:
ffb407b459
Change-Id: Id7fe4b61bdabaef90536443d9a57c1644c4910d6
Yabin Cui [Wed, 6 Nov 2019 19:22:31 +0000 (19:22 +0000)]
Merge "simpleperf: add browser option in test.py."
Yabin Cui [Tue, 5 Nov 2019 23:55:18 +0000 (15:55 -0800)]
Merge "simpleperf: add temporary work around for debug interface change."
am:
b1907a385b
Change-Id: I94690b74c8a6226461ddc4a87785d716e909debb
Yabin Cui [Tue, 5 Nov 2019 23:53:58 +0000 (15:53 -0800)]
simpleperf: add browser option in test.py.
To control whether generated html files should be shown in browser.
Bug: none
Test: test.py.
Change-Id: I58eeae716e42068bd5f278bb8006d8818e3fc63c
Yabin Cui [Tue, 5 Nov 2019 23:41:02 +0000 (23:41 +0000)]
Merge "simpleperf: add temporary work around for debug interface change."
Yabin Cui [Tue, 5 Nov 2019 22:31:17 +0000 (14:31 -0800)]
simpleperf: add temporary work around for debug interface change.
To fix a libunwindstack problem, ART appends new debug entries to the
end of the debug entry list, insteading prepending to it. This breaks
CtsSimpleperfTestCases.
This CL adds a temporary work around in simpleperf, so we have time
to try other fixes in ART.
Bug:
143375574
Test: run simpleperf_unit_test
Change-Id: I5d73792996fb89d22a664b982e667ba0a4ee8276
Yabin Cui [Tue, 5 Nov 2019 21:42:45 +0000 (13:42 -0800)]
Merge "simpleperf: keep generated data of test.py."
am:
a3ae531171
Change-Id: I522d0746f5da8fba11ffce524a1da8dfe271951d
Yabin Cui [Tue, 5 Nov 2019 21:24:23 +0000 (21:24 +0000)]
Merge "simpleperf: keep generated data of test.py."
Yabin Cui [Tue, 29 Oct 2019 00:16:54 +0000 (17:16 -0700)]
simpleperf: keep generated data of test.py.
Keep generated data of each test of test.py in a separate directory,
so we can:
1) check generated html after testing.
2) check profiling data for failed tests.
3) run tests for different devices in different dirs at the same time.
Also continue test when a test pass fails in run_tests().
Bug:
142972498
Test: run test.py.
Change-Id: If8468f0e180d441b74c070b978375b27c293a006
Yabin Cui [Fri, 1 Nov 2019 22:46:32 +0000 (15:46 -0700)]
Merge "simpleperf: test profiling apps with the same abi."
am:
16f464c226
Change-Id: I33d4f7c58ac0ce4e04b88eb0732ebd0ff892be30
Yabin Cui [Fri, 1 Nov 2019 22:23:43 +0000 (22:23 +0000)]
Merge "simpleperf: test profiling apps with the same abi."
Yabin Cui [Wed, 30 Oct 2019 23:40:55 +0000 (16:40 -0700)]
simpleperf: test profiling apps with the same abi.
32-bit simpleperf can't profile 64-bit java app. Because simpleperf
uses process_vm_readv() to read jit debug interface of the app process.
If the jit debug info is at address >= 1<<32, then 32-bit simpleperf
can't read it.
So install apks in the same abi as the test to avoid test failure.
Bug: none
Test: run 32-bit simpleperf_unit_test.
Change-Id: Ie3b4db320389bf5acb30ff5ea1f071b5fc3e2736
Yabin Cui [Thu, 31 Oct 2019 18:24:02 +0000 (11:24 -0700)]
Merge "simpleperf: fix small errors in JITDebugReader."
am:
3abdb92860
Change-Id: I16b9acbdd30238f24ad0699e50b534f2486a9e7c
Yabin Cui [Thu, 31 Oct 2019 17:39:12 +0000 (17:39 +0000)]
Merge "simpleperf: fix small errors in JITDebugReader."
Yabin Cui [Wed, 30 Oct 2019 23:07:28 +0000 (16:07 -0700)]
simpleperf: fix small errors in JITDebugReader.
1. When seeing an entry with symfile_size = 0, we should move
to the next entry.
2. Skip labels having zero length in jit debug file.
Bug: none
Test: run simpleperf_unit_test.
Change-Id: Iaa914cc4c6567ae5950194507c82e92316802a80
Xin Li [Wed, 30 Oct 2019 20:55:14 +0000 (20:55 +0000)]
Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@
5915889 into stage-aosp-master" into stage-aosp-master
Elliott Hughes [Wed, 30 Oct 2019 19:55:20 +0000 (12:55 -0700)]
Merge "simpleperf: just use _Exit directly."
am:
5279bc2913
Change-Id: Ia878014b838ab7bac268d9978a6c6d025679036c
Elliott Hughes [Wed, 30 Oct 2019 19:39:36 +0000 (19:39 +0000)]
Merge "simpleperf: just use _Exit directly."
Xin Li [Wed, 30 Oct 2019 18:50:43 +0000 (11:50 -0700)]
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@
5915889 into stage-aosp-master
Bug:
142003500
Change-Id: I8dc23d9aa9be16993cdd3aef967dabd988c6d908
Elliott Hughes [Wed, 30 Oct 2019 01:34:28 +0000 (18:34 -0700)]
simpleperf: just use _Exit directly.
We don't actually need the quick_exit() machinery because we weren't
setting any at_quick_exit() handlers, so just call _Exit() directly.
This will let us remove the Mac/Windows quick_exit() implementation from
libbase (and will let simpleperf exit just a little bit quicker).
Test: treehugger
Change-Id: I4ce74cb80acc744721cf367930ca3e577b8fc614
Paul Crowley [Wed, 30 Oct 2019 00:48:59 +0000 (17:48 -0700)]
Merge "libfscrypt: Export FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64"
am:
0cd171a09f
Change-Id: I88a4162a1439eb9118e17cf9bfb107b6e06851cf
Treehugger Robot [Wed, 30 Oct 2019 00:27:58 +0000 (00:27 +0000)]
Merge "libfscrypt: Export FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64"
Paul Crowley [Tue, 29 Oct 2019 21:16:57 +0000 (14:16 -0700)]
libfscrypt: Export FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64
We need to test for this flag when deciding whether to set
stable_inodes.
Bug:
143307095
Test: Set inlinecrypt_optimized, check that stable_inodes is set
Change-Id: Ic3245466eccd88ed2784ff4b2a348ca65085e2a4