OSDN Git Service
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"
Yabin Cui [Tue, 6 Jun 2017 01:51:18 +0000 (01:51 +0000)]
Merge "simpleperf: fix app_profiler.py." am:
d98c857902 am:
5ea663c3ab am:
545ee30d39
am:
f2fa27393c
Change-Id: Ib4245d4d936ea836c94f83b72c98aa0d3be47cbc
Yabin Cui [Tue, 6 Jun 2017 01:43:29 +0000 (01:43 +0000)]
Merge "simpleperf: fix app_profiler.py." am:
d98c857902 am:
5ea663c3ab
am:
545ee30d39
Change-Id: I1d1523e06c56959e89cffa0ba877188a2333975a
Yabin Cui [Tue, 6 Jun 2017 01:37:58 +0000 (01:37 +0000)]
Merge "simpleperf: fix app_profiler.py." am:
d98c857902
am:
5ea663c3ab
Change-Id: Ie6a8909be81a63ba032b0616fb8c2aa156c96d22
Yabin Cui [Tue, 6 Jun 2017 01:32:55 +0000 (01:32 +0000)]
Merge "simpleperf: fix app_profiler.py."
am:
d98c857902
Change-Id: I24b7656d7670c89ea2ff8de434d3ac69f92e70e2
Yabin Cui [Tue, 6 Jun 2017 01:24:10 +0000 (01:24 +0000)]
Merge "simpleperf: fix app_profiler.py."
Yabin Cui [Tue, 6 Jun 2017 01:08:23 +0000 (18:08 -0700)]
simpleperf: fix app_profiler.py.
Previous change makes app_profiler.py not work on rooted devices
because of using '>xxx' as a flag to store stdout files. Change
this to a more obvious way.
Bug: http://b/
62028152
Test: run app_profiler.py on both rooted and non-rooted devices.
Change-Id: Ice2399d007a64a7d0000560b2368a392620b1053
Guang Zhu [Mon, 5 Jun 2017 21:40:21 +0000 (14:40 -0700)]
add component metadata tag to CTS kernel config test cases
Bug:
36140955
Bug:
35360169
Test: new unit test to ensure that all modules have this field
Change-Id: I1478559f4aeb8d16e7ef0a1bc65fec6644fe3c65
Merged-In: I60cdfb77e7c20615fde43612cc77b0b6846612fa
Guang Zhu [Mon, 5 Jun 2017 21:40:21 +0000 (14:40 -0700)]
add component metadata tag to CTS kernel config test cases
Bug:
36140955
Bug:
35360169
Test: new unit test to ensure that all modules have this field
Change-Id: I60cdfb77e7c20615fde43612cc77b0b6846612fa
Jaegeuk Kim [Mon, 5 Jun 2017 23:17:19 +0000 (23:17 +0000)]
Merge "f2fs: adjust change for f2fs-tools v1.8.0"
Mark Salyzyn [Mon, 5 Jun 2017 16:07:34 +0000 (09:07 -0700)]
kernel.config: add CONFIG_NFS* testing
The following configs are not supported on Android:
CONFIG_NFSD
CONFIG_NFS_FS
Test: run CTS and kernel-config-unit-tests
Bug:
37753761
Change-Id: I13a9a2d5265079a1f99512c48b5bbcfd4bba68dd
Mark Salyzyn [Mon, 5 Jun 2017 16:07:34 +0000 (09:07 -0700)]
kernel.config: add CONFIG_NFS* testing
The following configs are not supported on Android:
CONFIG_NFSD
CONFIG_NFS_FS
Test: run CTS and kernel-config-unit-tests
Bug:
37753761
Change-Id: I13a9a2d5265079a1f99512c48b5bbcfd4bba68dd
Jaegeuk Kim [Mon, 5 Jun 2017 16:26:40 +0000 (09:26 -0700)]
f2fs: adjust change for f2fs-tools v1.8.0
Change-Id: I41364cbb0781fa5e30567ce7713ef3a2548fa261
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Yabin Cui [Fri, 2 Jun 2017 23:46:02 +0000 (23:46 +0000)]
Merge "simpleperf: add thread name in report_sample.proto." am:
b33edada95 am:
f13c66de88 am:
6b75d33fa7
am:
f7b2ec0bbf
Change-Id: Ic81dafb8192fcdc2b6ec3e6421ced1f1b23876fe
Yabin Cui [Fri, 2 Jun 2017 23:42:06 +0000 (23:42 +0000)]
Merge "simpleperf: add thread name in report_sample.proto." am:
b33edada95 am:
f13c66de88
am:
6b75d33fa7
Change-Id: I312fe7738ea5f03fe2c007018186f7320d99b40a
Yabin Cui [Fri, 2 Jun 2017 23:38:18 +0000 (23:38 +0000)]
Merge "simpleperf: add thread name in report_sample.proto." am:
b33edada95
am:
f13c66de88
Change-Id: Ied50dc7eb9a3d663f624fb4aec3ca42d1e1ed6d5
Yabin Cui [Fri, 2 Jun 2017 23:34:18 +0000 (23:34 +0000)]
Merge "simpleperf: add thread name in report_sample.proto."
am:
b33edada95
Change-Id: I1d2852d3c3497e692b1f03596a999b8556b05b93
Yabin Cui [Fri, 2 Jun 2017 23:27:37 +0000 (23:27 +0000)]
Merge "simpleperf: add thread name in report_sample.proto."
Yabin Cui [Fri, 2 Jun 2017 21:47:33 +0000 (14:47 -0700)]
simpleperf: add thread name in report_sample.proto.
Bug: http://b/
62189080
Test: run simpleperf_unit_test.
Change-Id: I3c96f6474e56b2f51a00f85082973e5d1c1aec72
Yabin Cui [Fri, 2 Jun 2017 00:07:11 +0000 (00:07 +0000)]
Merge "simpleperf: write -1 to perf_event_paranoid when running as root." am:
668878b3b7 am:
df104e1ed8 am:
6ec981b750
am:
f55d48bf08
Change-Id: Ibba4472ae691f3eb0ad863cde2ea8d55f72ccf38
Yabin Cui [Thu, 1 Jun 2017 23:46:25 +0000 (23:46 +0000)]
Merge "simpleperf: write -1 to perf_event_paranoid when running as root." am:
668878b3b7 am:
df104e1ed8
am:
6ec981b750
Change-Id: I5ed1c31bb336bb060d228e1866d8b0c8cd5d9816
Yabin Cui [Thu, 1 Jun 2017 23:37:49 +0000 (23:37 +0000)]
Merge "simpleperf: write -1 to perf_event_paranoid when running as root." am:
668878b3b7
am:
df104e1ed8
Change-Id: I56f126547cac5741c93513b9a2581be551da6034
Yabin Cui [Thu, 1 Jun 2017 23:36:09 +0000 (23:36 +0000)]
Merge "simpleperf: write -1 to perf_event_paranoid when running as root."
am:
668878b3b7
Change-Id: I46bbb7af11b38538384243ba91d30204def53a13
Treehugger Robot [Thu, 1 Jun 2017 23:29:12 +0000 (23:29 +0000)]
Merge "simpleperf: write -1 to perf_event_paranoid when running as root."
Yabin Cui [Thu, 1 Jun 2017 21:34:29 +0000 (21:34 +0000)]
Merge "simpleperf: fix app_profiler.py." am:
f4f68176b3 am:
7ac7c486df am:
b396fbccef
am:
1c7a854e5f
Change-Id: I3888575822ddd46b57320847434408327d885f0f
Yabin Cui [Thu, 1 Jun 2017 21:32:01 +0000 (21:32 +0000)]
Merge "simpleperf: fix app_profiler.py." am:
f4f68176b3 am:
7ac7c486df
am:
b396fbccef
Change-Id: I9b6db3b74fb389dec6556d3630d6fc80d289eb62