OSDN Git Service
Fabien Sanglard [Thu, 13 Jul 2017 16:54:35 +0000 (16:54 +0000)]
Merge "Inferno: A framegrapher based on simpleperf" am:
af30023228 am:
d8f0a1eb93
am:
f72ee84ba0
Change-Id: I7f3c76af95c049425985b6dd89d00c75dfe24c80
Fabien Sanglard [Thu, 13 Jul 2017 16:52:33 +0000 (16:52 +0000)]
Merge "Inferno: A framegrapher based on simpleperf" am:
af30023228
am:
d8f0a1eb93
Change-Id: I595ef7ed445cd973d413ac8f712d4ff8b67fff14
Fabien Sanglard [Thu, 13 Jul 2017 16:49:33 +0000 (16:49 +0000)]
Merge "Inferno: A framegrapher based on simpleperf"
am:
af30023228
Change-Id: I9b8ca44ac7ffa79870fa40c7c52bfd60d1259413
Fabien Sanglard [Thu, 13 Jul 2017 16:46:21 +0000 (16:46 +0000)]
Merge "Inferno: A framegrapher based on simpleperf"
Sen Jiang [Thu, 13 Jul 2017 05:54:54 +0000 (05:54 +0000)]
Merge "os-release.d: set the default version to four numbers." am:
80e0678406 am:
65f9088af1
am:
2653fea4c7
Change-Id: I9c30b760626671f38a604149834da2cc8e547b80
Sen Jiang [Thu, 13 Jul 2017 05:52:53 +0000 (05:52 +0000)]
Merge "os-release.d: set the default version to four numbers." am:
80e0678406
am:
65f9088af1
Change-Id: I44152b354f0b872ef5b0c54bf4ac13496742cfbc
Sen Jiang [Thu, 13 Jul 2017 05:50:57 +0000 (05:50 +0000)]
Merge "os-release.d: set the default version to four numbers."
am:
80e0678406
Change-Id: Id75fbf587b59623b8c4ced6f108f880724362210
Treehugger Robot [Thu, 13 Jul 2017 05:46:38 +0000 (05:46 +0000)]
Merge "os-release.d: set the default version to four numbers."
Yabin Cui [Thu, 13 Jul 2017 01:37:41 +0000 (01:37 +0000)]
Merge "simpleperf: add test for recording cpu-clock." am:
9dc8dd6de2 am:
4f5d2f4357
am:
3e74919c11
Change-Id: Id3c2a2d54fbf9f8181dc6777846d64ea9edea8fd
Yabin Cui [Thu, 13 Jul 2017 01:35:10 +0000 (01:35 +0000)]
Merge "simpleperf: add test for recording cpu-clock." am:
9dc8dd6de2
am:
4f5d2f4357
Change-Id: Ifffef0768bfce6ae932f23d40c6d2c2bdb58d6c6
Yabin Cui [Thu, 13 Jul 2017 01:33:11 +0000 (01:33 +0000)]
Merge "simpleperf: add test for recording cpu-clock."
am:
9dc8dd6de2
Change-Id: I94a66720ceeeb0b95eca5eadb8fd529f5744d931
Treehugger Robot [Thu, 13 Jul 2017 01:30:30 +0000 (01:30 +0000)]
Merge "simpleperf: add test for recording cpu-clock."
Sen Jiang [Tue, 4 Apr 2017 20:24:56 +0000 (13:24 -0700)]
os-release.d: set the default version to four numbers.
We will report system_version and product_version separately to Omaha,
so revert back to using four numbers for version.
Test: cat $OUT/system/etc/os-release.d/system_version
Change-Id: Ife69a7a17d1a06cc9127540cb39f27ce4fd0c944
(cherry picked from commit
d454042d764713ead2b87b78f4d2292d2d422d45)
Yabin Cui [Thu, 13 Jul 2017 00:49:05 +0000 (00:49 +0000)]
Merge "simpleperf: enforce support of dwarf based callgraph." am:
1564048fd3 am:
63d9e48597
am:
aedec0dc79
Change-Id: I24c3bf2e65bcfaed42f41a73ad7fef075783594b
Fabien Sanglard [Wed, 28 Jun 2017 20:18:52 +0000 (13:18 -0700)]
Inferno: A framegrapher based on simpleperf
Inferno generates flamegraph for an entire process in one click.
The HTML report is automatically opened in the machine browser.
To run it on surfaceflinger, start UIBench to generate load and:
- ./inferno.sh (Linux/MacOS)
- ./inferno.bat (Windows)
See report.html for a sample report.
Change-Id: I35a20fcfe4b385dbf45832bef0ff69b80a44e1d6
Yabin Cui [Thu, 13 Jul 2017 00:46:37 +0000 (00:46 +0000)]
Merge "simpleperf: enforce support of dwarf based callgraph." am:
1564048fd3
am:
63d9e48597
Change-Id: I281bc4465071c642bad981196ab993c5b61bbf4c
Yabin Cui [Thu, 13 Jul 2017 00:44:42 +0000 (00:44 +0000)]
Merge "simpleperf: enforce support of dwarf based callgraph."
am:
1564048fd3
Change-Id: I8fea0476d4e95ba9fa807760f2cf7e61b82a4c40
Yabin Cui [Thu, 13 Jul 2017 00:42:36 +0000 (00:42 +0000)]
Merge "simpleperf: enforce support of dwarf based callgraph."
Yabin Cui [Wed, 12 Jul 2017 21:50:07 +0000 (14:50 -0700)]
simpleperf: enforce support of dwarf based callgraph.
If it is not supported by the kernel, it may be because
a kernel patch "perf: Fix arch_perf_out_copy_user default",
or a configuration HAVE_PERF_USER_STACK_DUMP is missing.
Bug: http://b/
63634097
Test: run simpleperf_unit_tests.
Change-Id: I4d3b2de72925c3566bcb0ebe41872919b7312687
Yabin Cui [Wed, 12 Jul 2017 21:25:46 +0000 (14:25 -0700)]
simpleperf: add test for recording cpu-clock.
Bug: http://b/
63135835
Test: run the test on marlin.
Change-Id: I5b51eaafb596dc7df886b59b5ea208ae9c2c739a
Maggie White [Fri, 7 Jul 2017 18:26:10 +0000 (18:26 +0000)]
Merge "Additional setup and reduced file collision" into oc-dr1-dev
am:
b5aca0236f
Change-Id: I2b4a19920e567a690eeb79b2c8328bcd7191fdec
TreeHugger Robot [Fri, 7 Jul 2017 18:14:36 +0000 (18:14 +0000)]
Merge "Additional setup and reduced file collision" into oc-dr1-dev
Maggie White [Thu, 6 Jul 2017 00:01:40 +0000 (17:01 -0700)]
Additional setup and reduced file collision
There's some additional setup needed to make sure the devices are all in
the same state, so I added instructions to the README.
I also changed the system_stats functions to use variables to store
string outputs instead of files to avoid collision when running multiple
instances of the script from the same directory.
Finally, I added cleanup at the end to remove the files created in the
process, and some general code cleanup throughout the script.
Bug:
62536649
Test: manual test on several devices
Change-Id: I843a1cefcf6bd11f28e513d735b3bf313442efd2
Android Build Merger (Role) [Thu, 6 Jul 2017 16:07:54 +0000 (16:07 +0000)]
Merge "Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev am:
7f60c1a8af" into oc-dr1-dev-plus-aosp
Jin Qian [Thu, 6 Jul 2017 16:06:47 +0000 (16:06 +0000)]
Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev
am:
7f60c1a8af
Change-Id: If208ee125530792171cc194a9995588cff2bd219
Jin Qian [Thu, 6 Jul 2017 16:06:30 +0000 (16:06 +0000)]
Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev
am:
7f60c1a8af
Change-Id: I6be2a4583eae7d7ffa1246316309fc7743396b9c
TreeHugger Robot [Thu, 6 Jul 2017 14:24:05 +0000 (14:24 +0000)]
Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev
Android Build Merger (Role) [Wed, 5 Jul 2017 22:41:55 +0000 (22:41 +0000)]
Merge "Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am:
ec913d2a15" into oc-dr1-dev-plus-aosp
Jin Qian [Wed, 5 Jul 2017 22:41:12 +0000 (22:41 +0000)]
Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev
am:
ec913d2a15
Change-Id: I7329e6edcd6e5b3ff786d2f74587d254d8b05be0
Jin Qian [Wed, 5 Jul 2017 22:40:53 +0000 (22:40 +0000)]
Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev
am:
ec913d2a15
Change-Id: I15d803cc98a8d9010cabe342a45ca916fb625db7
TreeHugger Robot [Wed, 5 Jul 2017 22:33:36 +0000 (22:33 +0000)]
Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev
Mark Salyzyn [Wed, 28 Jun 2017 14:29:33 +0000 (14:29 +0000)]
Merge "kernel.config: check console-ramoops-0" am:
3cd4b5a765 am:
66a4b1bd79
am:
12981e42a7
Change-Id: I0381e6e215a04dd6c4bd63e4a0ae3ddc38085e2b
Mark Salyzyn [Wed, 28 Jun 2017 14:26:04 +0000 (14:26 +0000)]
Merge "kernel.config: check console-ramoops-0" am:
3cd4b5a765
am:
66a4b1bd79
Change-Id: I817d00383d64cf5f4a4562f66f330f0a95fe8e28
Mark Salyzyn [Wed, 28 Jun 2017 14:22:34 +0000 (14:22 +0000)]
Merge "kernel.config: check console-ramoops-0"
am:
3cd4b5a765
Change-Id: I6972df5357f71ffcda97cdcbacaba8aa4eb726e1
Treehugger Robot [Wed, 28 Jun 2017 14:19:03 +0000 (14:19 +0000)]
Merge "kernel.config: check console-ramoops-0"
Yabin Cui [Tue, 27 Jun 2017 21:35:29 +0000 (21:35 +0000)]
Merge "simpleperf: add demo for kotlin." am:
d39db9b0f5 am:
1e391c4bad
am:
46993f430c
Change-Id: Ic45829fdbe23c1c2edf38f1f79d85650ad8495c5
Yabin Cui [Tue, 27 Jun 2017 21:32:00 +0000 (21:32 +0000)]
Merge "simpleperf: add demo for kotlin." am:
d39db9b0f5
am:
1e391c4bad
Change-Id: I8d7df6cc72bd42078a44b9c823cf1de3ec5a38cf
Yabin Cui [Tue, 27 Jun 2017 21:28:31 +0000 (21:28 +0000)]
Merge "simpleperf: add demo for kotlin."
am:
d39db9b0f5
Change-Id: Ie469016cf1d336ac2c88a0522c7913aee8d26ec1
Mark Salyzyn [Tue, 27 Jun 2017 16:36:52 +0000 (09:36 -0700)]
kernel.config: check console-ramoops-0
On later kernels /sys/fs/pstore/console-ramoops becomes
/sys/fs/pstore/console-ramoops-0. One or the other is
present, but not both.
Test: none
Bug:
63058217
Change-Id: I4b54cfdd9f347735ccd2debd08a1baa167c9a24f
Yabin Cui [Tue, 27 Jun 2017 21:20:39 +0000 (21:20 +0000)]
Merge "simpleperf: add demo for kotlin."
Yabin Cui [Tue, 27 Jun 2017 01:40:36 +0000 (18:40 -0700)]
simpleperf: add demo for kotlin.
And fix annotate.py to include kotlin source code.
Bug: http://b/
32834638
Test: profile the app on bullhead and marlin using scripts manually.
Change-Id: Ic812cd2f8db7d047ceac58e3f5ae6a3f19e1879f
Maggie White [Tue, 27 Jun 2017 00:58:01 +0000 (00:58 +0000)]
Added setup commands and option to specify device
am:
5d58ea1a22
Change-Id: I6348882937564d22cc0d0df50fe6c32066e665d2
Jin Qian [Wed, 7 Jun 2017 18:32:16 +0000 (11:32 -0700)]
ext4_utils: copy mke2fs.conf to /etc
mke2fs tool reads /etc/mke2fs.conf for filesystem configurations
Bug:
35219933
Change-Id: I2af633ffd3b37f9f5ad287375ea40b212bf61a01
Merged-In: I2af633ffd3b37f9f5ad287375ea40b212bf61a01
Jin Qian [Thu, 8 Jun 2017 00:52:27 +0000 (17:52 -0700)]
ext4_utils: copy mke2fs.conf to recovery /etc
Bug:
35219933
Change-Id: I9af35a32adde24d751e5b11f9efcf6eca252db74
Merged-In: I9af35a32adde24d751e5b11f9efcf6eca252db74
Jin Qian [Mon, 26 Jun 2017 19:34:49 +0000 (19:34 +0000)]
Merge "use f2fs upstream host to generate image" am:
6a9444152f am:
7c17f07be9
am:
0d864d3704
Change-Id: I77e49ee0558a31f2bdc314faa628231a8f95e870
Jin Qian [Mon, 26 Jun 2017 19:29:24 +0000 (19:29 +0000)]
Merge "use f2fs upstream host to generate image" am:
6a9444152f
am:
7c17f07be9
Change-Id: I85a4c546c1091be681a3222ac50cfb98f314d0cb
Jin Qian [Mon, 26 Jun 2017 19:23:47 +0000 (19:23 +0000)]
Merge "use f2fs upstream host to generate image"
am:
6a9444152f
Change-Id: I74846499dfc5e9c7058571353b442e90fd0ac998
Jin Qian [Mon, 26 Jun 2017 19:07:49 +0000 (19:07 +0000)]
Merge "use f2fs upstream host to generate image"
Maggie White [Thu, 22 Jun 2017 00:42:25 +0000 (17:42 -0700)]
Added setup commands and option to specify device
The script previously did not configure any framework settings for this
script, so I added commands to disable any features that could affect
the performance numbers like wifi, NFC, screen rotation. It also clears
notifications and starts the device on the home screen.
It's not possible prior to this commit to run the app-launcher on a
host with multiple devices attached to adb, so I added a '-s <serial
number' option that allows the user to specify a specific device based
on its serial number.
I also changed the spacing of the script to be all spaces instead of
mixed tabs and spaces.
Test: Manually ran script on a marlin device
Change-Id: I82c621fe280033c55ba38bfdf95836fd95f5ed58
Yang Jin [Thu, 22 Jun 2017 18:20:51 +0000 (11:20 -0700)]
use f2fs upstream host to generate image
calls make_f2fs -S <size> <filename>
Test: ./mkf2fsuserimg.sh ~/android/userdata.img
2000000000
Bug:
62493641
Change-Id: I4d3631a631fbdfbfc680eeba5f2a1dde204cba25
Merged-In: I4d3631a631fbdfbfc680eeba5f2a1dde204cba25
Yabin Cui [Fri, 23 Jun 2017 21:52:14 +0000 (21:52 +0000)]
Merge "simpleperf: fix the way to pull perf.data on windows." am:
7c8b89acad am:
cac9fc0914
am:
67937ab0d6
Change-Id: I7fb9194a99603c17ffbc12a6319a4f826780fb69
Yabin Cui [Fri, 23 Jun 2017 21:48:16 +0000 (21:48 +0000)]
Merge "simpleperf: fix the way to pull perf.data on windows." am:
7c8b89acad
am:
cac9fc0914
Change-Id: I2fe3a27759180ee49de41fe24d00b7645e007790
Yabin Cui [Fri, 23 Jun 2017 21:43:14 +0000 (21:43 +0000)]
Merge "simpleperf: fix the way to pull perf.data on windows."
am:
7c8b89acad
Change-Id: I0978ba64f16c964a8b3a54f892eefb11ce6d80ad
Yabin Cui [Fri, 23 Jun 2017 21:38:34 +0000 (21:38 +0000)]
Merge "simpleperf: fix the way to pull perf.data on windows."
Yabin Cui [Wed, 21 Jun 2017 22:57:31 +0000 (15:57 -0700)]
simpleperf: fix the way to pull perf.data on windows.
Bug: http://b/
32834638
Test: run app_profiler.py on linux/darwin/windows.
Change-Id: Id932ad7d0a21598eae7d844e6c33c6e64df22c5a
Yabin Cui [Thu, 22 Jun 2017 22:10:39 +0000 (22:10 +0000)]
Merge "simpleperf: fix x86 register dump on x86_64." am:
5abacf3bcf am:
1815f49dee
am:
688e4dfc51
Change-Id: If8d2ef858adf152d64e9d7ef685b74ecf8938fa4
Yabin Cui [Thu, 22 Jun 2017 22:06:57 +0000 (22:06 +0000)]
Merge "simpleperf: fix x86 register dump on x86_64." am:
5abacf3bcf
am:
1815f49dee
Change-Id: Ic4eac31d6bde6001e6beb5664b28de25bce3c96c
Yabin Cui [Thu, 22 Jun 2017 22:02:57 +0000 (22:02 +0000)]
Merge "simpleperf: fix x86 register dump on x86_64."
am:
5abacf3bcf
Change-Id: I988fca28fd873575d6bfb2b542d91b5eecb29f7b
Yabin Cui [Thu, 22 Jun 2017 21:58:47 +0000 (21:58 +0000)]
Merge "simpleperf: fix x86 register dump on x86_64."
Yabin Cui [Thu, 22 Jun 2017 20:02:29 +0000 (13:02 -0700)]
simpleperf: fix x86 register dump on x86_64.
x86_64 linux kernel doesn't support dumping registers like DS.
If simpleperf32 requests dumping these registers, it will fail.
So don't request them to avoid failure.
Bug: None.
Test: run simpleperf32 manually on x86_64.
Change-Id: I220ce5378bad8f0c3c9deb2ef32128fd3262b96d
Yabin Cui [Thu, 22 Jun 2017 19:19:22 +0000 (19:19 +0000)]
Merge "simpleperf: Support Ctrl-C in app_profiler.py." am:
7941d1917b am:
c1a5f290f6
am:
9820d0fdcb
Change-Id: I174a7b0ca63cf259fa900aafd7bc03b2058a3f3b
Yabin Cui [Thu, 22 Jun 2017 19:14:52 +0000 (19:14 +0000)]
Merge "simpleperf: Support Ctrl-C in app_profiler.py." am:
7941d1917b
am:
c1a5f290f6
Change-Id: I2328a2844cccfe1db5db44a824374b44122d888f
Yabin Cui [Thu, 22 Jun 2017 19:10:29 +0000 (19:10 +0000)]
Merge "simpleperf: Support Ctrl-C in app_profiler.py."
am:
7941d1917b
Change-Id: If56fea0daa9fd9e3022dd19ad08b41e96c3e8b51
Yabin Cui [Thu, 22 Jun 2017 19:05:06 +0000 (19:05 +0000)]
Merge "simpleperf: Support Ctrl-C in app_profiler.py."
Yabin Cui [Thu, 22 Jun 2017 02:57:28 +0000 (02:57 +0000)]
Merge "simpleperf: fix importing tkinter in report.py." am:
1ad1e76f95 am:
bd48c993ab
am:
300bbc8cbd
Change-Id: Id2b12acaaec41ade521426f48798b54fac2af79f
Yabin Cui [Thu, 22 Jun 2017 02:53:33 +0000 (02:53 +0000)]
Merge "simpleperf: fix importing tkinter in report.py." am:
1ad1e76f95
am:
bd48c993ab
Change-Id: I74ae4869b536c0b7c2829639ccbbeef323cef726
Yabin Cui [Thu, 22 Jun 2017 02:49:59 +0000 (02:49 +0000)]
Merge "simpleperf: fix importing tkinter in report.py."
am:
1ad1e76f95
Change-Id: Ib85e9a59f94870e736511068975acb4bc9f704a9
Yabin Cui [Thu, 22 Jun 2017 02:46:46 +0000 (02:46 +0000)]
Merge "simpleperf: fix importing tkinter in report.py."
Yabin Cui [Wed, 21 Jun 2017 19:19:36 +0000 (12:19 -0700)]
simpleperf: Support Ctrl-C in app_profiler.py.
Bug: http://b/
32834638
Test: kill app_profiler.py with Ctrl-C manually.
Change-Id: I03b8813080b45e324c66ce3de27e5dd1f8849446
Yabin Cui [Wed, 21 Jun 2017 23:50:09 +0000 (16:50 -0700)]
simpleperf: fix importing tkinter in report.py.
On darwin/windows, python2.7 doesn't have tkinter.
So we need to try both tkinter and Tkinter.
Also make the font size larger. Because the old size
is too small on darwin.
Bug: http://b/
32834638
Test: run report.py on linux/darwin/windows.
Change-Id: I8bb0b51fcdd99f70b01d4ca2ee2e9e9a6447870a
Yabin Cui [Wed, 21 Jun 2017 19:34:58 +0000 (19:34 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
4120823." am:
2c60e40066 am:
174c68b693
am:
aa0e9193fd
Change-Id: I8a92e4d59387e7df5855e7c5371fef5f9102e9c7
Yabin Cui [Wed, 21 Jun 2017 19:32:31 +0000 (19:32 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
4120823." am:
2c60e40066
am:
174c68b693
Change-Id: If3fc2ebc260abb852d9882ba15ed2edc5987279a
Yabin Cui [Wed, 21 Jun 2017 19:28:41 +0000 (19:28 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
4120823."
am:
2c60e40066
Change-Id: Icb06488922f97cafa5255574affbe8751b11e916
Yabin Cui [Wed, 21 Jun 2017 19:13:38 +0000 (19:13 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
4120823."
Yabin Cui [Wed, 21 Jun 2017 18:43:53 +0000 (11:43 -0700)]
simpleperf: update simpleperf prebuilts to build
4120823.
Taken from branch aosp-master.
Bug: None
Test: None
Change-Id: Ifa518c6af1f1f9201e324092f82e8b97407aa85e
Yabin Cui [Tue, 20 Jun 2017 05:04:21 +0000 (05:04 +0000)]
Merge "simpleperf: create libsimpleperf_record library." am:
ebf4293198 am:
3f0b11a14b
am:
2591e939ba
Change-Id: Id1d72208d31aa032cb2e82a3107534026ea54db5
Yabin Cui [Tue, 20 Jun 2017 04:57:08 +0000 (04:57 +0000)]
Merge "simpleperf: create libsimpleperf_record library." am:
ebf4293198
am:
3f0b11a14b
Change-Id: I77d1f458f30842d7325ec1d5aea4a99ce6947b8a
Yabin Cui [Tue, 20 Jun 2017 02:19:41 +0000 (02:19 +0000)]
Merge "simpleperf: create libsimpleperf_record library."
am:
ebf4293198
Change-Id: I53503175b391d94522bcc84cf4bce7a29f0d4394
Treehugger Robot [Tue, 20 Jun 2017 02:14:56 +0000 (02:14 +0000)]
Merge "simpleperf: create libsimpleperf_record library."
Romain Guy [Thu, 8 Jun 2017 19:17:20 +0000 (19:17 +0000)]
Fix macOS build am:
c3ccab73be
am:
8fb5ed9dfb
Change-Id: If2225ede8691d1a272b4718d63babf9aec1ef636
Romain Guy [Thu, 8 Jun 2017 19:15:37 +0000 (19:15 +0000)]
Fix macOS build am:
c3ccab73be
am:
797cdee074
Change-Id: Iea48585f6e0ba8de0bdff2f811b7e1557eb9f7c3
Romain Guy [Thu, 8 Jun 2017 19:13:01 +0000 (19:13 +0000)]
Fix macOS build
am:
c3ccab73be
Change-Id: Id6c408f3f0c8268a4723623114a94f7b6fe47dcc
Romain Guy [Thu, 8 Jun 2017 19:12:08 +0000 (19:12 +0000)]
Fix macOS build
am:
c3ccab73be
Change-Id: I0bf642ea554fd0af408538feb09c2fd7fb58875f
Colin Cross [Thu, 8 Jun 2017 16:24:37 +0000 (16:24 +0000)]
Merge "Fix macOS build" am:
b9b7f3f061 am:
710e8f4da4
am:
46e53c56f0 -s ours
Change-Id: I5055b5a82ad2e1eaf3929d2c7b6ba701cc698a5d
Colin Cross [Thu, 8 Jun 2017 16:04:30 +0000 (16:04 +0000)]
Merge "Fix macOS build" am:
b9b7f3f061
am:
710e8f4da4
Change-Id: Ib109ceca0597a8a04dde6b44f865a7704605583b
Colin Cross [Thu, 8 Jun 2017 15:48:53 +0000 (15:48 +0000)]
Merge "Fix macOS build"
am:
b9b7f3f061
Change-Id: I6f6d24801ea090c3725378ff6572381cb09836c9
Romain Guy [Thu, 8 Jun 2017 15:48:51 +0000 (15:48 +0000)]
Fix macOS build
am:
b86fd88966
Change-Id: I54926a8e2ef870e47017589ed7d4fca55657d829
Romain Guy [Thu, 8 Jun 2017 00:05:03 +0000 (17:05 -0700)]
Fix macOS build
Bug:
34719251
Test: compile
Change-Id: I97e93313f9b6ab7e8a753d4035b7805b21fdfa2d
(cherry picked from commit
b86fd88966aa15c2b9cce1bf0f7907fcdd11134e)
Colin Cross [Thu, 8 Jun 2017 15:43:24 +0000 (15:43 +0000)]
Merge "Fix macOS build"
Romain Guy [Thu, 8 Jun 2017 00:05:03 +0000 (17:05 -0700)]
Fix macOS build
Test: compile
Change-Id: I97e93313f9b6ab7e8a753d4035b7805b21fdfa2d
Merged-In: I97e93313f9b6ab7e8a753d4035b7805b21fdfa2d
(cherry picked from commit
b86fd88966aa15c2b9cce1bf0f7907fcdd11134e)
Romain Guy [Thu, 8 Jun 2017 00:05:03 +0000 (17:05 -0700)]
Fix macOS build
Test: compile
Change-Id: I97e93313f9b6ab7e8a753d4035b7805b21fdfa2d
Guang Zhu [Tue, 6 Jun 2017 19:40:27 +0000 (19:40 +0000)]
add component metadata tag to CTS kernel config test cases am:
4313a5d7e6
am:
c4efad7a08 -s ours
Change-Id: I950b7289af632658088aeaec88484dd17b2d42ee
Guang Zhu [Tue, 6 Jun 2017 19:29:19 +0000 (19:29 +0000)]
add component metadata tag to CTS kernel config test cases
am:
4313a5d7e6
Change-Id: I1b8f3fc91d8f563c267261098fb7653e4d37b393
Mark Salyzyn [Tue, 6 Jun 2017 19:11:58 +0000 (19:11 +0000)]
resolve merge conflicts of
4bc9219d to oc-dev-plus-aosp
am:
9d02ca813f
Change-Id: Ib99bfeadc267769a70fe978e651df3236f4a01b8
Guang Zhu [Tue, 6 Jun 2017 19:02:39 +0000 (19:02 +0000)]
Merge "add component metadata tag to CTS kernel config test cases"
Yabin Cui [Fri, 2 Jun 2017 22:21:50 +0000 (15:21 -0700)]
simpleperf: create libsimpleperf_record library.
Add interface to control perf counters.
Bug: http://b/
35725972
Test: run simpleperf_record_test.
Change-Id: I2a9979f807253c60a9db6304454934034161c854
Mark Salyzyn [Tue, 6 Jun 2017 17:09:33 +0000 (10:09 -0700)]
resolve merge conflicts of
4bc9219d to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Bug:
37753761
Change-Id: I4898abc8dd63fdfb4c4ca8a6e69a6198c4882cb3
Mark Salyzyn [Tue, 6 Jun 2017 16:51:57 +0000 (16:51 +0000)]
Merge "kernel.config: add CONFIG_NFS* testing" am:
160671d409
am:
9e7b953199
Change-Id: I1417b71ff604cb2868934659839b486616666c3d
Mark Salyzyn [Tue, 6 Jun 2017 16:46:57 +0000 (16:46 +0000)]
Merge "kernel.config: add CONFIG_NFS* testing"
am:
160671d409
Change-Id: I7785489bc04968f99a86cb1d6fe485f79ec00c56
Treehugger Robot [Tue, 6 Jun 2017 16:40:21 +0000 (16:40 +0000)]
Merge "kernel.config: add CONFIG_NFS* testing"
OSDN Git Service
