OSDN Git Service
Chih-hung Hsieh [Fri, 6 May 2016 18:46:10 +0000 (18:46 +0000)]
Merge "Fix google-explicit-constructor warnings."
Chih-Hung Hsieh [Fri, 6 May 2016 17:41:04 +0000 (10:41 -0700)]
Fix google-explicit-constructor warnings.
Bug:
28341362
Change-Id: I420d23cc1f7ed44e1d9a215ee6815afab365046e
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 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:14:44 +0000 (16:14 +0000)]
Merge "Fix google-explicit-constructor warnings."
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:02:42 +0000 (19:02 +0000)]
Merge "simpleperf: always build static binary on device."
Chih-hung Hsieh [Mon, 18 Apr 2016 20:48:53 +0000 (20:48 +0000)]
Merge "Fix some google-runtime-int warnings."
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 [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 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: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:12:35 +0000 (23:12 +0000)]
Merge "Switch to BoringSSL for crypto."
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
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
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:01:00 +0000 (22:01 +0000)]
Merge "postinst: Update postinstall_example."
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
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: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 [Tue, 29 Mar 2016 18:18:47 +0000 (18:18 +0000)]
Merge "Simpleperf: add test for reporting callgraph of shared libraries in apk file."
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
Yabin Cui [Sat, 26 Mar 2016 03:05:11 +0000 (03:05 +0000)]
Merge "simpleperf: don't looking for _text symbol in /proc/kallsyms."
Yabin Cui [Sat, 26 Mar 2016 00:43:43 +0000 (17:43 -0700)]
simpleperf: don't looking for _text symbol in /proc/kallsyms.
simpleperf looks for _text symbol in /proc/kallsyms to get
kernel address space information. But that info is no longer
needed. As some kernels don't have _text symbol, we should
remove the corresponding code.
Bug:
27814103
Change-Id: I4eb9869b58c51846c99b1204f304cd107a0eb354
Daniel Cashman [Wed, 23 Mar 2016 14:10:57 +0000 (14:10 +0000)]
Merge "aslr_test: Fix typo."
dcashman [Tue, 22 Mar 2016 23:08:26 +0000 (16:08 -0700)]
aslr_test: Fix typo.
(cherry-pick of internal commit:
b543b4ed380bd3571f23225b216ad82860d281ee)
Bug:
26512380
Change-Id: I3e92b3ac7412a14ef875297310541fccd1774c03
Yabin Cui [Sat, 19 Mar 2016 00:38:36 +0000 (00:38 +0000)]
Merge "Simpleperf: support reading symbols from .gnu_debugdata."
Yabin Cui [Sat, 19 Mar 2016 00:03:51 +0000 (00:03 +0000)]
Merge "Simpleperf: insert testdata into simpleperf_unit_test for target build."
Yabin Cui [Sat, 19 Mar 2016 00:03:37 +0000 (00:03 +0000)]
Merge "Simpleperf: remove dependency on global current_arch."
Yabin Cui [Fri, 18 Mar 2016 04:18:53 +0000 (21:18 -0700)]
Simpleperf: support reading symbols from .gnu_debugdata.
As in https://sourceware.org/gdb/onlinedocs/gdb/MiniDebugInfo.html,
elf files can store mini debug information in .gnu_debugdata.
Bug:
27744639
Change-Id: If4a53a4a1332824388ee309ac63a008dc5cf8d5c
Yabin Cui [Fri, 18 Mar 2016 19:30:31 +0000 (12:30 -0700)]
Simpleperf: remove dependency on global current_arch.
When running unit tests on arm64 devices:
[OK] ReportCommandTest.dwarf_callgraph
[OK] record_cmd.dwarf_callchain_sampling.
ERROR: can't unwind data recorded on a different architecture.
It is because ReportCommandtest.dwarf_callgraph opens a perf.data
recorded on x86_64, and changes current_arch. It causes a problem when
the test record_cmd.dwarf_callchain_sampling calls libbacktrace built
on aarch64. Athough it doesn't make the test fail, we should fix this.
Change-Id: I2cd70369a769ef2199cab2302b8b824369be0907
Yabin Cui [Fri, 18 Mar 2016 20:48:42 +0000 (13:48 -0700)]
Simpleperf: insert testdata into simpleperf_unit_test for target build.
Before this change, we need to download testdata/ to device to run
unit tests. By inserting testdata into unit test elf file, we no
longer need to dowload testdata/ or add -t option to run unit tests
on device.
Change-Id: I888def6d55f893768dd8917083eead869b78c24b
Pirama Arumuga Nainar [Fri, 18 Mar 2016 21:54:50 +0000 (21:54 +0000)]
Merge "Update simpleperf for LLVM rebase to r256229."
Daniel Cashman [Wed, 16 Mar 2016 16:07:46 +0000 (16:07 +0000)]
Merge "Correct aslr_test minimum arm value."
dcashman [Tue, 15 Mar 2016 22:14:20 +0000 (15:14 -0700)]
Correct aslr_test minimum arm value.
Default mmap_rnd_bits value is now equal to the maximum supported (16)
on arm, not the minimum, 8. Adjust the test criteria to match this.
(cherry-pick of internal commit:
6d7b862b59743b64500b9b079c90cc50d556ecdf)
Bug:
27680571
Change-Id: I2017bf3b77b9513b0c8a797b6fe3dc6aef8ef431
Daniel Cashman [Mon, 14 Mar 2016 17:55:19 +0000 (17:55 +0000)]
Merge "Migrate aslr test to gtest."
dcashman [Mon, 7 Mar 2016 18:32:05 +0000 (10:32 -0800)]
Migrate aslr test to gtest.
Create tests which test the values of mmap_rnd_bits, and
mmap_rnd_compat_bits, if applicable, and verify that the address space
is randomized as expected given the provided values.
Also add a pair of tests to CTS that enforce that the observed entropy
is at least as high as a designated value. That value will start as our
default value, which also corresponds to the maximum value of some
configurations.
Packaging of executables along with a nativetest suite is not supported,
so add a dummy nativetest suite, scrape_mmap_addr, which ensure that the
executables are present along with the given tests at predictable
locations.
(cherry-pick of internal commit:
d661642651a6689c76d3f575b4b5dbf04e6b75bd)
Bug:
26512380
Change-Id: I8c4a68f3d10a57f9a51bdc6084df622cf8517b51
Yabin Cui [Thu, 10 Mar 2016 21:53:09 +0000 (21:53 +0000)]
Merge "simpleperf: check if dwarf callgraph is supported by kernel before testing."
Yabin Cui [Thu, 10 Mar 2016 19:49:57 +0000 (11:49 -0800)]
simpleperf: check if dwarf callgraph is supported by kernel before testing.
Move inclusion of poll.h from header files to source files,
as event_selection_set.h is used by cmd_report_test.cpp, which
can be built on windows.
Bug:
27590546
Change-Id: Ic6b141a93d96610f911ab52da1d927b7f619ccb2
Yabin Cui [Wed, 9 Mar 2016 22:48:52 +0000 (14:48 -0800)]
Update simpleperf for LLVM rebase to r256229.
Bug:
26987366
Change-Id: I55b0ab1214e0365d523eff3c8c1db2aa30effd18
Mark Salyzyn [Wed, 9 Mar 2016 16:50:49 +0000 (16:50 +0000)]
Merge "su: Segmentation Fault on unknown numerical uids"
Mark Salyzyn [Tue, 8 Mar 2016 21:36:00 +0000 (13:36 -0800)]
su: Segmentation Fault on unknown numerical uids
e.g.
su 2999,2999,2999 echo hello
Segmentation Fault
return from getpwuid is NULL. KISS we opt to unset LOGNAME and USER
Change-Id: I7e7eddacfd6857f83482727eb5ec5c51b9170039
Mark Salyzyn [Tue, 8 Mar 2016 23:48:05 +0000 (23:48 +0000)]
Merge "cts: android.kernel.config"
Chih-Hung Hsieh [Fri, 4 Mar 2016 19:56:37 +0000 (19:56 +0000)]
Merge "Fix static analyzer warnings."
am:
5667da92fd
* commit '
5667da92fd874c30eff40eae488ae6e05dba9d31':
Fix static analyzer warnings.
Chih-hung Hsieh [Fri, 4 Mar 2016 19:38:44 +0000 (19:38 +0000)]
Merge "Fix static analyzer warnings."
Chih-Hung Hsieh [Fri, 4 Mar 2016 18:14:32 +0000 (10:14 -0800)]
Fix static analyzer warnings.
* Add missing free.
* Remove unused local variable.
BUG:
27120398
Change-Id: I84d32fcee5615a428bd1de6673a6f15036736998
Alex Deymo [Fri, 4 Mar 2016 05:45:33 +0000 (05:45 +0000)]
Merge "postinst: Update postinstall_example documentation."
am:
9be329ae32
* commit '
9be329ae3292cd3c90057bb8b945ac55ff35b2ca':
postinst: Update postinstall_example documentation.
Alex Deymo [Fri, 4 Mar 2016 05:39:49 +0000 (05:39 +0000)]
Merge "postinst: Update postinstall_example documentation."
George Burgess IV [Thu, 3 Mar 2016 21:53:17 +0000 (21:53 +0000)]
Merge "Cleanup uses of sprintf so we can deprecate it."
am:
33f2127b43
* commit '
33f2127b43c3f0a5bd4496822222810f22e1489d':
Cleanup uses of sprintf so we can deprecate it.
George Burgess IV [Thu, 3 Mar 2016 21:44:56 +0000 (21:44 +0000)]
Merge "Cleanup uses of sprintf so we can deprecate it."
Yabin Cui [Thu, 3 Mar 2016 19:08:53 +0000 (19:08 +0000)]
Merge "simpleperf: support building cts test."
am:
acf5a605e8
* commit '
acf5a605e8e97f6beab23a2b270a02c3565c12cd':
simpleperf: support building cts test.
Yabin Cui [Thu, 3 Mar 2016 18:59:38 +0000 (18:59 +0000)]
Merge "simpleperf: support building cts test."
Yabin Cui [Wed, 2 Mar 2016 21:56:28 +0000 (13:56 -0800)]
simpleperf: support building cts test.
1. build cts test libraries.
2. change tests to use tmpfile instead of perf.data.
3. support extracting testdata from cts test file.
Bug:
27387280
Change-Id: I7c5db77f3157d586d0c9beb446b247626e7cce36
Alex Deymo [Thu, 3 Mar 2016 02:02:17 +0000 (18:02 -0800)]
postinst: Update postinstall_example documentation.
We don't need the /postinst symlink anymore, instead we should provide
the path to the executable in the config. An example of how to setup
that is now included in the documentation of postinstall_example.
Bug:
27177071
TEST=Deployed this script as postinstall on edison-eng.
Change-Id: I2f7bd50174db42a57d25277883b0ec795ca17144
George Burgess IV [Wed, 2 Mar 2016 22:15:49 +0000 (14:15 -0800)]
Cleanup uses of sprintf so we can deprecate it.
Change-Id: I3ed15a7c261adf01c310bb58ff7ce836ea400bba
Yabin Cui [Wed, 2 Mar 2016 18:59:04 +0000 (18:59 +0000)]
Merge "simpleperf: fix analyzer warning."
am:
5cfed7b49b
* commit '
5cfed7b49b1ae706265d4181b1d4f0dbb79491f5':
simpleperf: fix analyzer warning.
Yabin Cui [Wed, 2 Mar 2016 18:47:52 +0000 (18:47 +0000)]
Merge "simpleperf: fix analyzer warning."
Lorenzo Colitti [Wed, 2 Mar 2016 08:15:41 +0000 (08:15 +0000)]
Merge "Delete net_test from system/extras now that it\'s in kernel/tests."
am:
3669b3f331
* commit '
3669b3f331485fec4a304177b8a80a25efd1f7d8':
Delete net_test from system/extras now that it's in kernel/tests.
Lorenzo Colitti [Wed, 2 Mar 2016 08:04:01 +0000 (08:04 +0000)]
Merge "Delete net_test from system/extras now that it's in kernel/tests."
Yabin Cui [Tue, 1 Mar 2016 22:05:25 +0000 (14:05 -0800)]
simpleperf: fix analyzer warning.
Bug:
27432175
Change-Id: If0e8bc724cf659508726215d515d3df30cbebe6b
Chih-Hung Hsieh [Tue, 1 Mar 2016 22:29:22 +0000 (22:29 +0000)]
Merge "Fix one static analyzer warning."
am:
63728630cb
* commit '
63728630cb507e1b797eafb6b22cc0720684b87c':
Fix one static analyzer warning.
Chih-hung Hsieh [Tue, 1 Mar 2016 22:22:28 +0000 (22:22 +0000)]
Merge "Fix one static analyzer warning."
Chih-Hung Hsieh [Tue, 1 Mar 2016 21:42:49 +0000 (13:42 -0800)]
Fix one static analyzer warning.
Result of 'realloc' is converted to a pointer of type 'struct
mapping_info *', which is incompatible with sizeof operand type 'struct
mapping *'
BUG:
27121003
Change-Id: Ib05b884ba577751a382b7a5dbbfea8cca2e0f23f
Elliott Hughes [Tue, 1 Mar 2016 20:07:42 +0000 (20:07 +0000)]
Merge "Fix pagemap_test#maps."
am:
5dc5241d77
* commit '
5dc5241d7785569a6a4b65df475ac9451cdfe531':
Fix pagemap_test#maps.
Elliott Hughes [Tue, 1 Mar 2016 20:06:55 +0000 (20:06 +0000)]
Merge "Fix pagemap_test#maps."
Elliott Hughes [Tue, 1 Mar 2016 16:02:37 +0000 (08:02 -0800)]
Fix pagemap_test#maps.
We don't necessarily have a brk-based heap.
Bug: http://b/
27425642
Change-Id: Iac30904ba35c645afe9b056de8df975ebce92a37
Than McIntosh [Tue, 1 Mar 2016 18:31:34 +0000 (18:31 +0000)]
Merge "Fix typo in \'help report\' output."
am:
4e6f660ab0
* commit '
4e6f660ab0d58bd375deec17f36532254183d29d':
Fix typo in 'help report' output.
Than McIntosh [Tue, 1 Mar 2016 18:27:45 +0000 (18:27 +0000)]
Merge "Fix typo in 'help report' output."
Than McIntosh [Tue, 1 Mar 2016 17:38:33 +0000 (12:38 -0500)]
Fix typo in 'help report' output.
Was "--pid", should be "--pids".
Change-Id: Icb49a3d7568bd8f339bf0e4e1065fe2367514588
Yabin Cui [Thu, 25 Feb 2016 20:38:25 +0000 (20:38 +0000)]
Merge "simpleperf: fix mac build."
am:
9e0f649ea9
* commit '
9e0f649ea94cce48df7bfca238fecac1ed1dac98':
simpleperf: fix mac build.
Yabin Cui [Thu, 25 Feb 2016 20:36:03 +0000 (20:36 +0000)]
Merge "simpleperf: fix mac build."
Yabin Cui [Thu, 25 Feb 2016 19:09:44 +0000 (19:09 +0000)]
Merge "simpleperf: port cmd_report_test to nonlinux."
am:
ec2bf27cb9
* commit '
ec2bf27cb962e55cfa25116ba5880ecb19910a07':
simpleperf: port cmd_report_test to nonlinux.
Yabin Cui [Thu, 25 Feb 2016 19:08:07 +0000 (19:08 +0000)]
Merge "simpleperf: port cmd_report_test to nonlinux."
Yabin Cui [Thu, 25 Feb 2016 19:02:30 +0000 (11:02 -0800)]
simpleperf: fix mac build.
I forgot that mac doesn't support whole static library. Change to static library
to avoid hiting the same problem in the future.
Bug:
26962895
Change-Id: Ia8e26c2e1cf7621391e00e100b22b7ed451dfa32
Yabin Cui [Wed, 24 Feb 2016 05:41:03 +0000 (21:41 -0800)]
simpleperf: port cmd_report_test to nonlinux.
And fix one build_id bug introduced by previous patch.
Bug:
26962895
Change-Id: Ibb8bd6ec77ee862bb01c26342d3b3024468e75b2
Lorenzo Colitti [Thu, 25 Feb 2016 13:37:48 +0000 (22:37 +0900)]
Delete net_test from system/extras now that it's in kernel/tests.
The directories are identical. This commit was generated by:
$ diff -u system/extras/tests/net_test kernel/tests/net/test/
$ cd system/extras/tests/net_test
$ git rm *
Bug:
27228782
Change-Id: I08ca870049c8e91bb0848314bf647f6e1ad2dd09
Lorenzo Colitti [Thu, 25 Feb 2016 13:18:08 +0000 (13:18 +0000)]
Merge "Cite more kernel commits."
am:
e090897280
* commit '
e0908972807e5366aba6af130a53803333f94145':
Cite more kernel commits.
Lorenzo Colitti [Thu, 25 Feb 2016 13:13:19 +0000 (13:13 +0000)]
Merge "Cite more kernel commits."
Lorenzo Colitti [Tue, 23 Feb 2016 14:42:10 +0000 (23:42 +0900)]
Cite more kernel commits.
Change-Id: Ia335d5c8461e7dfb41211977df74422e00012be8
Lorenzo Colitti [Mon, 22 Feb 2016 01:38:07 +0000 (01:38 +0000)]
Merge "Teach iproute how to dump IP addresses as well."
am:
9e73f5af39
* commit '
9e73f5af39c035f25b0ac081e999907865789f9e':
Teach iproute how to dump IP addresses as well.
Lorenzo Colitti [Mon, 22 Feb 2016 01:33:06 +0000 (01:33 +0000)]
Merge "Teach iproute how to dump IP addresses as well."
Lorenzo Colitti [Sun, 21 Feb 2016 13:45:09 +0000 (22:45 +0900)]
Teach iproute how to dump IP addresses as well.
Change-Id: I38b5182d9110d72758c48da4d0edc7cf0fb84283
Yabin Cui [Thu, 18 Feb 2016 20:35:28 +0000 (20:35 +0000)]
Merge "simpleperf: fix build by removing off64_t."
am:
21ac023d8e
* commit '
21ac023d8e90b61f4e82e3952a2f706f7db1038a':
simpleperf: fix build by removing off64_t.
Yabin Cui [Thu, 18 Feb 2016 20:26:56 +0000 (20:26 +0000)]
Merge "simpleperf: fix build by removing off64_t."
Yabin Cui [Thu, 18 Feb 2016 20:11:40 +0000 (12:11 -0800)]
simpleperf: fix build by removing off64_t.
Bug:
26962895
Change-Id: I211bacc22c2f6b6b24c639365c706e93d66ce4ac
Yabin Cui [Thu, 18 Feb 2016 18:33:34 +0000 (18:33 +0000)]
Merge "simpleperf: report symbols of native libraries in apk file."
am:
88a0a38c86
* commit '
88a0a38c86f34d1169fee5a66cc98bc3cc5ac30e':
simpleperf: report symbols of native libraries in apk file.