OSDN Git Service
Mark Salyzyn [Fri, 13 May 2016 16:49:26 +0000 (16:49 +0000)]
Merge "lockdep_chains: graph visualization" am:
bfe42baeae
am:
b50ec7f672
* commit '
b50ec7f672ab8d54a5f10e09db3d3e190b9bb6a8':
lockdep_chains: graph visualization
Change-Id: I35bdaa5a8993b7c67f267952354fa8f8cffedb65
Mark Salyzyn [Fri, 13 May 2016 16:46:55 +0000 (16:46 +0000)]
Merge "lockdep_chains: graph visualization"
am:
bfe42baeae
* commit '
bfe42baeaea18fd633b047a2464b482d1660bdf4':
lockdep_chains: graph visualization
Change-Id: I6d9ce11582e0e3e3e045c89dde50238477945aeb
Mark Salyzyn [Fri, 13 May 2016 16:42:33 +0000 (16:42 +0000)]
Merge "lockdep_chains: graph visualization"
Mark Salyzyn [Thu, 12 May 2016 17:48:25 +0000 (10:48 -0700)]
lockdep_chains: graph visualization
Create the system/extras/tools directory for simple analysis helpers.
Publish a host tool helper script that aids visualization of kernel
runtime collected lock dependencies. Helpful to look for circular
locks, or to get a handle on locking order used in a driver.
Bug:
28310683
Change-Id: Ib52c23f4cdefb37882232eff11b943eeb1b2abfa
Paul Crowley [Tue, 10 May 2016 22:17:21 +0000 (22:17 +0000)]
Fail with an error if we can\'t read the policy for encryption
am:
8d53b9619b
* commit '
8d53b9619ba913354ffdb23acf0108f7445bb8bc':
Fail with an error if we can't read the policy for encryption
Change-Id: I2c77a648bf5ef8b5d208662c4deb28e593e52be1
Paul Crowley [Wed, 27 Apr 2016 17:24:40 +0000 (10:24 -0700)]
Fail with an error if we can't read the policy for encryption
The absence of a policy reference in the unencrypted directory now
causes e4crypt_set_directory_policy to fail with an error. Callers
should call e4crypt_is_native (now moved into here) before calling this.
Bug:
28318405
Change-Id: I209292aba3abad3b19105c9afe2b84e8b3dd6874
Ying Wang [Fri, 6 May 2016 20:34:06 +0000 (20:34 +0000)]
Merge "Fix LOCAL_CPP_EXTENSION." am:
2597f3521e
am:
abe624c78e
* commit '
abe624c78e1a0c24581fd10cddf450369293576c':
Fix LOCAL_CPP_EXTENSION.
Change-Id: I564c7020ee90c1d46a21ff908592b41bbc94d4c8
Ying Wang [Fri, 6 May 2016 20:29:33 +0000 (20:29 +0000)]
Merge "Fix LOCAL_CPP_EXTENSION."
am:
2597f3521e
* commit '
2597f3521efd5e6f999ad9aa1e0e3dd6304ba3e4':
Fix LOCAL_CPP_EXTENSION.
Change-Id: I572c5c6810b888b2580c01db31ee2a0eecb7c9b6
Treehugger Robot [Fri, 6 May 2016 20:16:40 +0000 (20:16 +0000)]
Merge "Fix LOCAL_CPP_EXTENSION."
Chih-hung Hsieh [Fri, 6 May 2016 19:08:08 +0000 (19:08 +0000)]
Merge "Fix google-explicit-constructor warnings." am:
ea7e4f7cbc
am:
c3aa198a1d
* commit '
c3aa198a1d972780cfa719099d08edfabb57aacf':
Fix google-explicit-constructor warnings.
Change-Id: I57c7856998a157bef4b2da37418618a00757c590
Chih-Hung Hsieh [Fri, 6 May 2016 19:03:21 +0000 (19:03 +0000)]
Merge "Fix google-explicit-constructor warnings."
am:
ea7e4f7cbc
* commit '
ea7e4f7cbc86e8363b1771cc848d026e0faa6400':
Fix google-explicit-constructor warnings.
Change-Id: Ie8972db88d6ad1e009e27bfb4ad99d890d37ec5b
Chih-hung Hsieh [Fri, 6 May 2016 18:46:10 +0000 (18:46 +0000)]
Merge "Fix google-explicit-constructor warnings."
Ying Wang [Fri, 6 May 2016 02:41:11 +0000 (19:41 -0700)]
Fix LOCAL_CPP_EXTENSION.
Bug:
28622149
Change-Id: I785b9bdf90f77ed87c41542f3bd010c6b7356069
Chih-Hung Hsieh [Fri, 6 May 2016 17:41:04 +0000 (10:41 -0700)]
Fix google-explicit-constructor warnings.
Bug:
28341362
Change-Id: I420d23cc1f7ed44e1d9a215ee6815afab365046e
Mohamad Ayyash [Fri, 29 Apr 2016 19:19:03 +0000 (19:19 +0000)]
Incr Ext4: Properly merge block_allocation lists
am:
f7124d6c95
* commit '
f7124d6c955c0453361b0ff47c5c94619e68087f':
Incr Ext4: Properly merge block_allocation lists
Change-Id: Ie6e931abfe5744d17496dac823a6c2605b35fa5d
Mohamad Ayyash [Fri, 29 Apr 2016 18:18:27 +0000 (18:18 +0000)]
Incremental Ext4 Bug: prevent out of bound boundary allocations
am:
d2ed02a940
* commit '
d2ed02a94086e1221041bc59825add3d0a657e19':
Incremental Ext4 Bug: prevent out of bound boundary allocations
Change-Id: Ic521ccfd6402e3419e9471edd5996b05596c12bc
Mohamad Ayyash [Fri, 29 Apr 2016 18:14:02 +0000 (11:14 -0700)]
Incr Ext4: Properly merge block_allocation lists
BUG:
27698960
Change-Id: Ia31b8319e0d1c8644ae1798116007a4b35c39e9b
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Mohamad Ayyash [Fri, 29 Apr 2016 04:49:01 +0000 (21:49 -0700)]
Incremental Ext4 Bug: prevent out of bound boundary allocations
This happens around the boundary of block groups where a slightly
different block boundary is set based on size of filesystem which means
allocations based on a previous filesystem layout need to verify they're
not crossing that new bounday
BUG:
27698960
Change-Id: I45d444b4477f14f71e8f17144523505a7525b4e2
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Treehugger Robot [Wed, 27 Apr 2016 21:25:25 +0000 (21:25 +0000)]
Merge "Fix google-explicit-constructor warnings." am:
b1304be
am:
c4515b5
* commit '
c4515b505123815839f0ee672741e82423aa72e6':
Fix google-explicit-constructor warnings.
Change-Id: I39d53b09a735a6e0604ce153e4f6e8f4257473ce
Chih-Hung Hsieh [Wed, 27 Apr 2016 21:22:56 +0000 (21:22 +0000)]
Merge "Fix google-explicit-constructor warnings."
am:
b1304be
* commit '
b1304be7031f83401561c469c7f8624f76a2f007':
Fix google-explicit-constructor warnings.
Change-Id: I3ba62da5bbe74437c3ec0ddc9c7a68557b4e1e0d
Treehugger Robot [Wed, 27 Apr 2016 21:09:34 +0000 (21:09 +0000)]
Merge "Fix google-explicit-constructor warnings."
Yabin Cui [Tue, 26 Apr 2016 18:14:55 +0000 (18:14 +0000)]
Merge "simpleperf: improve cpu_hotplug tests." am:
75726c6
am:
9499f0e
* commit '
9499f0e9f3d87a59e473bdd55e5582c8402db845':
simpleperf: improve cpu_hotplug tests.
Change-Id: Ide267393ce6095ec9b1733704af25bb5a0854553
Yabin Cui [Tue, 26 Apr 2016 18:11:41 +0000 (18:11 +0000)]
Merge "simpleperf: improve cpu_hotplug tests."
am:
75726c6
* commit '
75726c65d973cd9ab139221a0c8a60a0fab98f6b':
simpleperf: improve cpu_hotplug tests.
Change-Id: I76aee490bb5dc9d68d6038b5888a10554d20a65c
Yabin Cui [Tue, 26 Apr 2016 17:55:49 +0000 (17:55 +0000)]
Merge "simpleperf: improve cpu_hotplug tests."
Yabin Cui [Mon, 18 Apr 2016 20:43:20 +0000 (13:43 -0700)]
simpleperf: improve cpu_hotplug tests.
Add cpu hotplug test for ioctl(PERF_EVENT_IOC_ENABLE),
and improve cpu_hotplug tests by removing sleep calls.
Bug:
28384580
Change-Id: I5869cd9bb3086b6f3a73cf7dce4ffd720326c3c6
Chih-hung Hsieh [Tue, 26 Apr 2016 16:21:09 +0000 (16:21 +0000)]
Merge "Fix google-explicit-constructor warnings." am:
7ec2e36
am:
1ce5f21
* commit '
1ce5f21453f7132537bb684933cfc37cccef8c42':
Fix google-explicit-constructor warnings.
Change-Id: I49921e86b37c68a53825b91a0515a93eaf416193
Chih-Hung Hsieh [Tue, 26 Apr 2016 16:17:49 +0000 (16:17 +0000)]
Merge "Fix google-explicit-constructor warnings."
am:
7ec2e36
* commit '
7ec2e36c128a0f83aed3addbcf8a672f5dda9966':
Fix google-explicit-constructor warnings.
Change-Id: I3539bfe25d634b34fe1700abb0df183ac880ba17
Chih-hung Hsieh [Tue, 26 Apr 2016 16:14:44 +0000 (16:14 +0000)]
Merge "Fix google-explicit-constructor warnings."
Chih-Hung Hsieh [Mon, 25 Apr 2016 22:59:19 +0000 (15:59 -0700)]
resolve merge conflicts of
acc275a to nyc-dev-plus-aosp
Change-Id: Ia8f82614a3501d631c074667dfebc5e56e142752
Chih-Hung Hsieh [Mon, 25 Apr 2016 22:38:52 +0000 (22:38 +0000)]
Merge "Fix google-explicit-constructor warnings."
am:
84a6923
* commit '
84a692306714a11873879242fdadcf956234ad7e':
Fix google-explicit-constructor warnings.
Change-Id: Ib5ab8226bc8235cababee5773f7f6bb9959986fd
Chih-hung Hsieh [Mon, 25 Apr 2016 22:38:37 +0000 (22:38 +0000)]
Merge "Fix google-explicit-constructor warnings." am:
a8bbf56
am:
6ed77d3
* commit '
6ed77d30d5a077bafa0cba78d61bb6a60d8695d0':
Fix google-explicit-constructor warnings.
Change-Id: Ib8105abcdf0638e3c15dbf7cc7c67768b4a09d17
Chih-Hung Hsieh [Mon, 25 Apr 2016 22:32:40 +0000 (22:32 +0000)]
Merge "Fix google-explicit-constructor warnings."
am:
a8bbf56
* commit '
a8bbf56210501d3cb724bd4f2709a9c3feb5d205':
Fix google-explicit-constructor warnings.
Change-Id: I4ebf442e2a709d906784170f62c56302e5057f09
Chih-hung Hsieh [Mon, 25 Apr 2016 22:30:17 +0000 (22:30 +0000)]
Merge "Fix google-explicit-constructor warnings."
Chih-hung Hsieh [Mon, 25 Apr 2016 22:21:09 +0000 (22:21 +0000)]
Merge "Fix google-explicit-constructor warnings."
Chih-Hung Hsieh [Mon, 25 Apr 2016 21:17:14 +0000 (14:17 -0700)]
Fix google-explicit-constructor warnings.
Bug:
28341362
Change-Id: I9f388006f5593b9f224e98e93deca7da35c5618a
Chih-Hung Hsieh [Mon, 25 Apr 2016 21:12:26 +0000 (14:12 -0700)]
Fix google-explicit-constructor warnings.
Bug:
28341362
Change-Id: I1825b4e58c7c82e247a3be9cbe1139fa2b79f151
Chih-Hung Hsieh [Mon, 25 Apr 2016 21:08:08 +0000 (14:08 -0700)]
Fix google-explicit-constructor warnings.
Bug:
28341362
Change-Id: Ie9d9c33b48b179917f084e59a4e595c6eb972adf
Chih-Hung Hsieh [Mon, 25 Apr 2016 21:01:30 +0000 (14:01 -0700)]
Fix google-explicit-constructor warnings.
Bug:
28341362
Change-Id: I871beda49b122df7680ab712f7116469d343ad8f
Yabin Cui [Mon, 25 Apr 2016 19:23:24 +0000 (19:23 +0000)]
Merge "simpleperf: always build static binary on device." am:
7035e8f
am:
00f5b93
* commit '
00f5b939f6055fbdc6452194046202653605b06e':
simpleperf: always build static binary on device.
Change-Id: Ic5dae793c72dd1b7539a4e1a9c0ff6e5ad7ffbd3
Yabin Cui [Mon, 25 Apr 2016 19:17:58 +0000 (19:17 +0000)]
Merge "simpleperf: always build static binary on device."
am:
7035e8f
* commit '
7035e8f0cf0a952d58f867839cd96794d59ae50a':
simpleperf: always build static binary on device.
Change-Id: I7177d294d3dfdc682fae876a56592dd5339b56a4
Yabin Cui [Mon, 25 Apr 2016 19:02:42 +0000 (19:02 +0000)]
Merge "simpleperf: always build static binary on device."
Mohamad Ayyash [Tue, 19 Apr 2016 01:06:38 +0000 (01:06 +0000)]
make_ext4fs: Modify ext4 filesystem setup to speed up fsck
am:
dedf8f9705
* commit '
dedf8f9705df13e1fd07d3f754216d34725bb269':
make_ext4fs: Modify ext4 filesystem setup to speed up fsck
Change-Id: I07364ec2112966eff463ece718aa530887e5a36f
Chih-hung Hsieh [Mon, 18 Apr 2016 21:32:52 +0000 (21:32 +0000)]
Merge "Fix some google-runtime-int warnings." am:
0add9c5
am:
73dcd46
* commit '
73dcd46a9120f1acb2259b6b2ad9bb4fe98f5b38':
Fix some google-runtime-int warnings.
Change-Id: Ia506ca817826d5e03af3e7ec69abb72adff20226
Chih-Hung Hsieh [Mon, 18 Apr 2016 21:27:26 +0000 (21:27 +0000)]
Merge "Fix some google-runtime-int warnings."
am:
0add9c5
* commit '
0add9c5b35041af781e1433ae0790167e7b3277f':
Fix some google-runtime-int warnings.
Change-Id: Ieb19b039ca854953d38ce23ab378f3c5d3ec1495
Chih-hung Hsieh [Mon, 18 Apr 2016 20:48:53 +0000 (20:48 +0000)]
Merge "Fix some google-runtime-int warnings."
Mohamad Ayyash [Fri, 15 Apr 2016 02:43:31 +0000 (19:43 -0700)]
make_ext4fs: Modify ext4 filesystem setup to speed up fsck
1) Set EXT4_BG_INODE_UNINIT so fsck will skip scanning unused inodes
2) Use EXT4_FEATURE_RO_COMPAT_GDT_CSUM to enable group descriptor
checksums in filesystem which reduces overhead for fsck
BUG:
24747200
BUG:
28013112
Change-Id: I118ab26935442f452962b3a7c29c61acf76ad4d9
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Chih-Hung Hsieh [Fri, 15 Apr 2016 23:12:03 +0000 (16:12 -0700)]
Fix some google-runtime-int warnings.
Bug:
28220065
Change-Id: Ic6b24216d216bbb165a1420b52b11c7703b810a0
Yabin Cui [Fri, 15 Apr 2016 03:19:14 +0000 (03:19 +0000)]
simpleperf: use libbacktrace_offline static library.
am:
2362310 -s ours
* commit '
2362310b546b157eeee352e72b1585363002d662':
simpleperf: use libbacktrace_offline static library.
Change-Id: Ie1c65dc55664ab5ca1583a979b7233ae05391783
Yabin Cui [Thu, 14 Apr 2016 23:35:00 +0000 (16:35 -0700)]
simpleperf: always build static binary on device.
Bug:
28199918
Change-Id: I7008e6e7c0de60521bc7ae5f1b7ee4fd2d57cf04
Yabin Cui [Thu, 14 Apr 2016 04:28:54 +0000 (21:28 -0700)]
simpleperf: use libbacktrace_offline static library.
Device may not have libbacktrace_offline shared library, so always
using libbacktrace_offline static library.
Use simpleperf namespace to avoid conflicts with ThreadEntry in
libbacktrace.
Bug:
28152982
Change-Id: Ia2cdbee3b28556c790ccd7b061a801ed96f9b97c
(cherry picked from commit
040f7b4c62ce49f0af0746640e94d415764262cd)
Yabin Cui [Thu, 14 Apr 2016 21:38:25 +0000 (21:38 +0000)]
Merge "simpleperf: use libbacktrace_offline static library." am:
3952d8b
am:
670994c
* commit '
670994cffc767d20ca76284b16e06f7c9e3ec477':
simpleperf: use libbacktrace_offline static library.
Change-Id: I15c88d2ddec684d144a7a2fcf8b6117604a086d7
Yabin Cui [Thu, 14 Apr 2016 21:34:27 +0000 (21:34 +0000)]
Merge "simpleperf: use libbacktrace_offline static library."
am:
3952d8b
* commit '
3952d8b5c84c1efcd1136a6d2dca0022cfefcf3a':
simpleperf: use libbacktrace_offline static library.
Change-Id: I15fce7d59ceae949ae7dca496a3445bc873b4f65
Yabin Cui [Thu, 14 Apr 2016 21:14:54 +0000 (21:14 +0000)]
Merge "simpleperf: use libbacktrace_offline static library."
Yabin Cui [Thu, 14 Apr 2016 04:28:54 +0000 (21:28 -0700)]
simpleperf: use libbacktrace_offline static library.
Device may not have libbacktrace_offline shared library, so always
using libbacktrace_offline static library.
Use simpleperf namespace to avoid conflicts with ThreadEntry in
libbacktrace.
Bug:
28152982
Change-Id: Ia2cdbee3b28556c790ccd7b061a801ed96f9b97c
Treehugger Robot [Wed, 13 Apr 2016 17:38:44 +0000 (17:38 +0000)]
Merge "verity: delete keystore_signer" am:
6e6aa65
am:
21d49d9
* commit '
21d49d921661d49ffaac87ee3ad601778a563d19':
verity: delete keystore_signer
Change-Id: Ic4d0600aa0e49930636e6568a42d325efd93c2ae
Sami Tolvanen [Wed, 13 Apr 2016 17:35:19 +0000 (17:35 +0000)]
Merge "verity: delete keystore_signer"
am:
6e6aa65
* commit '
6e6aa65411432adee75005558e1bb6056fd9d77a':
verity: delete keystore_signer
Change-Id: I39c15949d9a4be171feb0f386bfd33bb1d81514e
Treehugger Robot [Wed, 13 Apr 2016 17:28:24 +0000 (17:28 +0000)]
Merge "verity: delete keystore_signer"
Sami Tolvanen [Wed, 13 Apr 2016 16:16:20 +0000 (09:16 -0700)]
verity: delete keystore_signer
This signer is unnecessary, because we are not using keystores.
Change-Id: Iede3b54ac137e79c51f7e673e7e32ac5717e9661
Elliott Hughes [Tue, 12 Apr 2016 23:30:03 +0000 (23:30 +0000)]
Merge "Switch to BoringSSL for crypto." am:
fae42a3
am:
31d3313
* commit '
31d331323353c67aa424e94692ae7932a71b751f':
Switch to BoringSSL for crypto.
Change-Id: I926a41fd7dea44130e971847b35616e221492841
Mattias Nissler [Tue, 12 Apr 2016 23:27:26 +0000 (23:27 +0000)]
Merge "Switch to BoringSSL for crypto."
am:
fae42a3
* commit '
fae42a336e7c343d2ae134d78f89996399caaa55':
Switch to BoringSSL for crypto.
Change-Id: I3f431075475e4921e801596090bd0d1b88579fdc
Elliott Hughes [Tue, 12 Apr 2016 23:12:35 +0000 (23:12 +0000)]
Merge "Switch to BoringSSL for crypto."
Mohamad Ayyash [Fri, 8 Apr 2016 17:56:22 +0000 (17:56 +0000)]
Merge "Remove canned_fs_config from ext4_utils" into nyc-dev
am:
b317b33
* commit '
b317b33a844ef2b5c072c07ead43be2c096c28b8':
Remove canned_fs_config from ext4_utils
Change-Id: I2c8c9bf6b6b8cccc8c8aa406397da1cb3c53b8bd
Mohamad Ayyash [Fri, 8 Apr 2016 17:39:05 +0000 (17:39 +0000)]
Merge "Remove canned_fs_config from ext4_utils" into nyc-dev
Mohamad Ayyash [Fri, 8 Apr 2016 05:15:57 +0000 (22:15 -0700)]
Remove canned_fs_config from ext4_utils
It is now also used in mksquashfs so it was added to libcutils
BUG:
27467028
Change-Id: I81c87938d5b6b200a8ad817f0c64c5ca699f451c
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Julien Desprez [Wed, 6 Apr 2016 14:44:13 +0000 (14:44 +0000)]
Use default path for mmapPerf binaries
am:
a8be0cf
* commit '
a8be0cf6f2bff90f6e3e89bba12c2e2473a2063d':
Use default path for mmapPerf binaries
Change-Id: I464d505a36e4af8d6b34969943de59ce11edef61
Mattias Nissler [Thu, 31 Mar 2016 14:29:37 +0000 (16:29 +0200)]
Switch to BoringSSL for crypto.
Adjust code and dependencies to use BoringSSL + libcrypto_utils
instead of libmincrypt.
Change-Id: Id1b4ee538923e9dac68a7db2521b70007119c268
Julien Desprez [Wed, 6 Apr 2016 13:40:56 +0000 (14:40 +0100)]
Use default path for mmapPerf binaries
Change-Id: Ic6994988152942e162e0b977afe48144b4d8bb32
Julien Desprez [Wed, 6 Apr 2016 09:00:09 +0000 (09:00 +0000)]
Convert mmapPerf to google-benchmark
am:
df7cd65
* commit '
df7cd654309bb90fe83fb823ff5c4f83c2a4afd0':
Convert mmapPerf to google-benchmark
Change-Id: I134d4e26bfaca6ad1deeaa83f9f3651ccb171a3e
Yabin Cui [Wed, 6 Apr 2016 01:23:14 +0000 (01:23 +0000)]
Merge "simpleperf: support reporting more than one event type." am:
0d47fe0
am:
3ebdd7e
* commit '
3ebdd7ee30dad03f195f2663d5b085e04c8f4195':
simpleperf: support reporting more than one event type.
Change-Id: Iddaf45a93c7aa80cb4b68407867656a2bef81185
Yabin Cui [Wed, 6 Apr 2016 01:19:44 +0000 (01:19 +0000)]
Merge "simpleperf: support reporting more than one event type."
am:
0d47fe0
* commit '
0d47fe0430a0d6edc517486478f50b1fb2987106':
simpleperf: support reporting more than one event type.
Change-Id: Iaa199818ae48f602460f4b860255d048a3a17201
Yabin Cui [Wed, 6 Apr 2016 01:15:22 +0000 (01:15 +0000)]
Merge "simpleperf: support reporting more than one event type."
Yabin Cui [Sat, 2 Apr 2016 03:22:35 +0000 (20:22 -0700)]
simpleperf: support reporting more than one event type.
When sampling kernel trace points, it is like to sample more than
one even type. Like `simpleperf record -e kmem:mm_page_alloc,kmem:mm_page_free`.
1. change record command to dump event_id for all records.
2. change report command and record reader to support multiple
event attrs.
3. hide record_cache inside EventSelectionSet.
4. add test to report multiple event types.
Bug:
27403614
Change-Id: Ic22a5527d68e7a843e3cf95e85381f8ad6bcb196
Julien Desprez [Tue, 5 Apr 2016 17:29:52 +0000 (18:29 +0100)]
Convert mmapPerf to google-benchmark
Bug:
24272167
Change-Id: I831c9d26495e77e041a9461ddbafc70d7d11f9b7
Mohamad Ayyash [Mon, 4 Apr 2016 19:55:24 +0000 (19:55 +0000)]
Merge "Make squashfs work on BSD and macOS" am:
05e61be
am:
80b6f13
* commit '
80b6f1317410a58bbd68db8a19733936af463f10':
Make squashfs work on BSD and macOS
Change-Id: I541f689c326cbd7a6132a533d4dfe75344a97446
Jaewan Kim [Mon, 4 Apr 2016 19:52:57 +0000 (19:52 +0000)]
Merge "Make squashfs work on BSD and macOS"
am:
05e61be
* commit '
05e61bec49233712091be9d40ee46962170a118d':
Make squashfs work on BSD and macOS
Change-Id: I2dae5ed9af9329fb048ce11fee7e5661f5a958ae
Jaewan Kim [Mon, 4 Apr 2016 19:52:34 +0000 (19:52 +0000)]
Make squashfs work on BSD and macOS
am:
d0f1a4d
* commit '
d0f1a4de8e8bd9a93fbeabdf679d75fe0362bfc6':
Make squashfs work on BSD and macOS
Change-Id: I1e98d6fa449b7030b32305fca71610475433de64
Jaewan Kim [Mon, 4 Apr 2016 15:32:24 +0000 (00:32 +0900)]
Make squashfs work on BSD and macOS
Change-Id: Ie025a3d70237a7a959203d8cd066d05acf9e94b2
Mohamad Ayyash [Mon, 4 Apr 2016 19:42:43 +0000 (19:42 +0000)]
Merge "Make squashfs work on BSD and macOS"
Jaewan Kim [Mon, 4 Apr 2016 15:32:24 +0000 (00:32 +0900)]
Make squashfs work on BSD and macOS
Change-Id: Ie025a3d70237a7a959203d8cd066d05acf9e94b2
Alex Deymo [Fri, 1 Apr 2016 22:21:46 +0000 (22:21 +0000)]
Merge "postinst: Update postinstall_example." am:
e15bfb5
am:
8305c62
* commit '
8305c62e68d82d5639f119a7696206c8621ed93e':
postinst: Update postinstall_example.
Change-Id: Ie6b88e07a847c7d6b7048895659bb0419854a5de
Alex Deymo [Fri, 1 Apr 2016 22:16:57 +0000 (22:16 +0000)]
Merge "postinst: Update postinstall_example."
am:
e15bfb5
* commit '
e15bfb5adeedccc272513e5d49c296dff4b30999':
postinst: Update postinstall_example.
Change-Id: I8b01e74aa311044ff3caaae3255b710d510a2d4d
Alex Deymo [Fri, 1 Apr 2016 22:01:00 +0000 (22:01 +0000)]
Merge "postinst: Update postinstall_example."
Yabin Cui [Fri, 1 Apr 2016 19:17:49 +0000 (19:17 +0000)]
Merge "simpleperf: loosen unwinding arch check for system wide collection." am:
96e12e7
am:
4489a7a
* commit '
4489a7ad84297f214787e39202c2aef13b6d79a4':
simpleperf: loosen unwinding arch check for system wide collection.
Change-Id: I5d328f5e98c6477819d5086da5624dfd613d3196
Yabin Cui [Fri, 1 Apr 2016 19:13:18 +0000 (19:13 +0000)]
Merge "simpleperf: loosen unwinding arch check for system wide collection."
am:
96e12e7
* commit '
96e12e78722988e912664b7323341799fdd12b9b':
simpleperf: loosen unwinding arch check for system wide collection.
Change-Id: I69d056af61f1b2ed94a829bd24c71c740d569198
Yabin Cui [Fri, 1 Apr 2016 19:03:36 +0000 (19:03 +0000)]
Merge "simpleperf: loosen unwinding arch check for system wide collection."
Yabin Cui [Thu, 31 Mar 2016 21:39:19 +0000 (14:39 -0700)]
simpleperf: loosen unwinding arch check for system wide collection.
When doing system wide collection, it is possible that there are
32-bit compat processes running on 64-bit devices. It is not proper
to abort in this situation. So loosen the check to allow it. Also
add corresponding test.
Bug:
27927427
Change-Id: I5c9253eb6e474497e4f37e234e0e523e141fab20
Julien Desprez [Thu, 31 Mar 2016 17:43:34 +0000 (17:43 +0000)]
Use default path to put benchmark binaries
am:
a4325d3
* commit '
a4325d3d28e8d6b0c0509175726620c643c4924d':
Use default path to put benchmark binaries
Change-Id: Ie4f2134409423fb9351f0c081b188401d34a2796
Julien Desprez [Thu, 31 Mar 2016 15:16:34 +0000 (16:16 +0100)]
Use default path to put benchmark binaries
In order to keep all the benchmark binaries in the same
output place.
Change-Id: I188f7933c230d8955905217b915899dd19e614bf
Alex Deymo [Thu, 31 Mar 2016 01:50:59 +0000 (18:50 -0700)]
postinst: Update postinstall_example.
The postinstall step now receives two parameters: the target slot and
the progress file descriptor. This file descriptor is a pipe where the
postinstall program can write back to the updater what's its current
progress.
Bug:
27880754
TEST=Deployed an image with the postinstall example installed.
Change-Id: I0afedb47556885d4e3b3f1b93be82314153ffc19
Yabin Cui [Thu, 31 Mar 2016 00:31:27 +0000 (00:31 +0000)]
Merge "simpleperf: build 32-bit binaries on 64-bit devices." am:
eaa9c1d
am:
7e31960
* commit '
7e31960f829010a0b3266f9ce240584e8d9a2e14':
simpleperf: build 32-bit binaries on 64-bit devices.
Change-Id: I7047290baaf736c2f8259f3a738d579618eb9953
Yabin Cui [Thu, 31 Mar 2016 00:31:27 +0000 (00:31 +0000)]
Merge "simpleperf: don\'t allow 64bit simpleperf unwinding 32bit processes." am:
178a9c4
am:
af5388a
* commit '
af5388a56d73c68fd63f12dc7ffb582ca8243093':
simpleperf: don't allow 64bit simpleperf unwinding 32bit processes.
Change-Id: I000b523f4a35ba2cefeedff7e2b4a2df920658f4
Yabin Cui [Thu, 31 Mar 2016 00:12:56 +0000 (00:12 +0000)]
Merge "simpleperf: build 32-bit binaries on 64-bit devices."
am:
eaa9c1d
* commit '
eaa9c1dc0c2c7bd4570e0b7c605bac207e6ab3a3':
simpleperf: build 32-bit binaries on 64-bit devices.
Change-Id: I3262a581e89742d45b701266dbed6bbacfec7c1d
Yabin Cui [Thu, 31 Mar 2016 00:12:56 +0000 (00:12 +0000)]
Merge "simpleperf: don\'t allow 64bit simpleperf unwinding 32bit processes."
am:
178a9c4
* commit '
178a9c49b863f0a8cf5e3f2dffc0439ad14b6cda':
simpleperf: don't allow 64bit simpleperf unwinding 32bit processes.
Change-Id: Id070632ece2d93b9d79da94dec87dfbbe558d444
Yabin Cui [Thu, 31 Mar 2016 00:08:42 +0000 (00:08 +0000)]
Merge "simpleperf: build 32-bit binaries on 64-bit devices."
Yabin Cui [Thu, 31 Mar 2016 00:08:30 +0000 (00:08 +0000)]
Merge "simpleperf: don't allow 64bit simpleperf unwinding 32bit processes."
Yabin Cui [Wed, 30 Mar 2016 23:21:47 +0000 (16:21 -0700)]
simpleperf: don't allow 64bit simpleperf unwinding 32bit processes.
Bug:
27927427
Change-Id: I87abc7f8d1f160da4366ed04db054206403bc803
Yabin Cui [Wed, 30 Mar 2016 22:37:53 +0000 (15:37 -0700)]
simpleperf: build 32-bit binaries on 64-bit devices.
Bug:
27927427
Change-Id: I5b6db459ab2c31e09e1f438a44b98efad5f814a5
Yabin Cui [Wed, 30 Mar 2016 01:22:40 +0000 (01:22 +0000)]
Simpleperf: add test for reporting callgraph of shared libraries in apk file.
am:
cb6b387 -s ours
* commit '
cb6b387ada3637832e188b63c811a2c298474140':
Simpleperf: add test for reporting callgraph of shared libraries in apk file.
Change-Id: Ie1dd4341b355d7e864845f906d6af2bd1c5c037f
Yabin Cui [Sat, 19 Mar 2016 01:47:43 +0000 (18:47 -0700)]
Simpleperf: add test for reporting callgraph of shared libraries in apk file.
Also add comment for how to generate each perf.data in testdata/.
Add --log <leve> argument in unit test to help debugging.
Bug:
26962895
Change-Id: Iaa5a81cd8da5174d5b5b4e7847811e2432bf0db8
(cherry picked from commit
8f680f60dc800bec880c5c35bfbc1ac36165e1f3)
Julien Desprez [Tue, 29 Mar 2016 18:59:59 +0000 (18:59 +0000)]
Merge "Update binder benchmark to use google-benchmark" into nyc-dev
am:
43d1014
* commit '
43d10141f1654a130f761741a62445b5dcb3456a':
Update binder benchmark to use google-benchmark
Change-Id: I756ff78046d40e2ab068892021fa698e14910cde
OSDN Git Service
