OSDN Git Service
Yabin Cui [Thu, 5 Jan 2017 23:16:47 +0000 (23:16 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
3614643." am:
c5775f1239 am:
8df3424b96 am:
4ab5f41bfa
am:
6c8ae66544
Change-Id: Ic65b867170ce7dfe77075ddc02e3f2ed085a9e07
Yabin Cui [Thu, 5 Jan 2017 23:13:16 +0000 (23:13 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
3614643." am:
c5775f1239 am:
8df3424b96
am:
4ab5f41bfa
Change-Id: Ib41afa4ed13c1068628f6c7242b1574e27443cbe
Yabin Cui [Thu, 5 Jan 2017 23:09:46 +0000 (23:09 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
3614643." am:
c5775f1239
am:
8df3424b96
Change-Id: Ie00b60a60f01c73bb8fc280607c1bf0c189da5ec
Yabin Cui [Thu, 5 Jan 2017 23:05:45 +0000 (23:05 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
3614643."
am:
c5775f1239
Change-Id: I913b359c341b5d9b06f6f79b94f8f4980d97f542
Yabin Cui [Thu, 5 Jan 2017 22:58:33 +0000 (22:58 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
3614643."
Yabin Cui [Thu, 5 Jan 2017 20:01:26 +0000 (12:01 -0800)]
simpleperf: update simpleperf prebuilts to build
3614643.
Taken from branch aosp-master.
Bug: http://b/
32834638
Test: None.
Change-Id: I6d456a932f8ab679da4c34f4113dc7414fe29d62
wangjiangshao [Thu, 5 Jan 2017 18:41:56 +0000 (18:41 +0000)]
Merge "libfec: add large file which larger than 4G operation support" am:
240aba7e8f am:
0dda84826c am:
4b3f1bcf99
am:
73ddc0132a
Change-Id: Ib1fb68bf42a34fe9667e440257859e87468489cc
wangjiangshao [Thu, 5 Jan 2017 18:38:22 +0000 (18:38 +0000)]
Merge "libfec: add large file which larger than 4G operation support" am:
240aba7e8f am:
0dda84826c
am:
4b3f1bcf99
Change-Id: I25444486be051346d366714010a3c25afafe60f9
Steven Moreland [Thu, 5 Jan 2017 18:37:57 +0000 (18:37 +0000)]
Merge "boot control: remove getInterfaceVersion" am:
9aaf345f02 am:
ac2940eb41 am:
794554ade8
am:
f63de5e4a6
Change-Id: I370a3131208764bacd52def386cd3e4af065eabb
wangjiangshao [Thu, 5 Jan 2017 18:35:23 +0000 (18:35 +0000)]
Merge "libfec: add large file which larger than 4G operation support" am:
240aba7e8f
am:
0dda84826c
Change-Id: I9adf2c558fd04c9fec3a4e90f7f2794bd309593a
Steven Moreland [Thu, 5 Jan 2017 18:34:56 +0000 (18:34 +0000)]
Merge "boot control: remove getInterfaceVersion" am:
9aaf345f02 am:
ac2940eb41
am:
794554ade8
Change-Id: Ie79205e71963e249d5b339c2f0326b07a6820eaf
wangjiangshao [Thu, 5 Jan 2017 18:32:22 +0000 (18:32 +0000)]
Merge "libfec: add large file which larger than 4G operation support"
am:
240aba7e8f
Change-Id: I2561343c51ecf1e76200a19fc17ac30d3999c0a8
Steven Moreland [Thu, 5 Jan 2017 18:31:56 +0000 (18:31 +0000)]
Merge "boot control: remove getInterfaceVersion" am:
9aaf345f02
am:
ac2940eb41
Change-Id: I493de1d3250187005b4e00d34557f20dee04767f
Steven Moreland [Thu, 5 Jan 2017 18:28:26 +0000 (18:28 +0000)]
Merge "boot control: remove getInterfaceVersion"
am:
9aaf345f02
Change-Id: I3f45fdfe70796dddab997656b73da7b4ffaab7c4
Treehugger Robot [Thu, 5 Jan 2017 18:28:05 +0000 (18:28 +0000)]
Merge "libfec: add large file which larger than 4G operation support"
Steven Moreland [Thu, 5 Jan 2017 18:24:11 +0000 (18:24 +0000)]
Merge "boot control: remove getInterfaceVersion"
wangjiangshao [Fri, 30 Dec 2016 14:57:42 +0000 (22:57 +0800)]
libfec: add large file which larger than 4G operation support
Add _LARGEFILE64_SOURCE to handle large files such as larger than 4G,
fix fec_open cannot open file larger than 4G
Bug: https://code.google.com/p/android/issues/detail?id=231508
Test: tested on Android N devices
Change-Id: I8df81a039cb987f6bde36384bf69e8ab119fd515
Signed-off-by: wangjiangshao <wangjiangshao@xiaomi.com>
Yabin Cui [Wed, 4 Jan 2017 23:29:39 +0000 (23:29 +0000)]
Merge "Revert "Revert "simpleperf: add binaries in sdk build.""" am:
01efd2baca am:
01355680e6 am:
d6276a4df1
am:
80603303b6
Change-Id: Ib5784a8d1243db67c86a982a493b8035b730f76d
Yabin Cui [Wed, 4 Jan 2017 23:24:35 +0000 (23:24 +0000)]
Merge "Revert "Revert "simpleperf: add binaries in sdk build.""" am:
01efd2baca am:
01355680e6
am:
d6276a4df1
Change-Id: I56808b55932fb5da0194c0ec4155b9a78c9e0f43
Yabin Cui [Wed, 4 Jan 2017 23:20:02 +0000 (23:20 +0000)]
Merge "Revert "Revert "simpleperf: add binaries in sdk build.""" am:
01efd2baca
am:
01355680e6
Change-Id: I0748676a7e0ac84079489417f37f682d839eb232
Yabin Cui [Wed, 4 Jan 2017 23:17:03 +0000 (23:17 +0000)]
Merge "Revert "Revert "simpleperf: add binaries in sdk build."""
am:
01efd2baca
Change-Id: Ic67f0f1754ca85d2d398d4e3c61032bb00b381c4
Yabin Cui [Wed, 4 Jan 2017 23:12:05 +0000 (23:12 +0000)]
Merge "Revert "Revert "simpleperf: add binaries in sdk build."""
Yabin Cui [Wed, 4 Jan 2017 21:27:26 +0000 (21:27 +0000)]
Revert "Revert "simpleperf: add binaries in sdk build.""
This reverts commit
266cf44be350c02766e9fe988185caeb224d0769.
And fix error in the original patch.
Bug: http://b/
32834638
Test: make x86-sdk and mips-sdk.
Change-Id: Ie9bc21ca461252f54c8f443747c8d9d1b5d33c02
Steven Moreland [Wed, 4 Jan 2017 21:00:07 +0000 (13:00 -0800)]
boot control: remove getInterfaceVersion
getInterfaceVersion doesn't provide any information and is being
removed. I've replaced the call with interfaceChain here so that a
better description can be obtained.
Bug:
34041669
Test: compiles
Change-Id: I00e5154e92edf2dd17b3e899b094589642ba3b3e
Yabin Cui [Wed, 4 Jan 2017 02:53:09 +0000 (02:53 +0000)]
Merge "Revert "simpleperf: add binaries in sdk build."" am:
b4cdbd535c am:
2f596464fd am:
46561919cc
am:
54d903a021
Change-Id: If32060a8ed49a52d1dcb93d57ed7ce98052b9ff8
Yabin Cui [Wed, 4 Jan 2017 02:50:36 +0000 (02:50 +0000)]
Merge "Revert "simpleperf: add binaries in sdk build."" am:
b4cdbd535c am:
2f596464fd
am:
46561919cc
Change-Id: I92595632d10dde1eb890895107e20c73ab80f162
Yabin Cui [Wed, 4 Jan 2017 02:48:41 +0000 (02:48 +0000)]
Merge "Revert "simpleperf: add binaries in sdk build."" am:
b4cdbd535c
am:
2f596464fd
Change-Id: I6969919508873bc4065849a70a9436329db603bb
Yabin Cui [Wed, 4 Jan 2017 02:46:39 +0000 (02:46 +0000)]
Merge "Revert "simpleperf: add binaries in sdk build.""
am:
b4cdbd535c
Change-Id: I62d6a3c61a9502daeb54c1b970515aa112dcf8ac
Yabin Cui [Wed, 4 Jan 2017 02:43:11 +0000 (02:43 +0000)]
Merge "Revert "simpleperf: add binaries in sdk build.""
Yabin Cui [Wed, 4 Jan 2017 02:41:21 +0000 (02:41 +0000)]
Revert "simpleperf: add binaries in sdk build."
This reverts commit
f6bc6f2e59a2f45c0e341be3a994363d99525986.
Change-Id: Ic8a2405372498ef8251bcf4b680408001c164550
Yabin Cui [Wed, 4 Jan 2017 02:13:47 +0000 (02:13 +0000)]
Merge "simpleperf: add binaries in sdk build." am:
507df68b78 am:
a9db82bfe9 am:
26edd04c6b
am:
1f614bc1c1
Change-Id: I36b276b23760fa7e09ff6c2aa624cee07422cf86
Yabin Cui [Wed, 4 Jan 2017 02:11:46 +0000 (02:11 +0000)]
Merge "simpleperf: add binaries in sdk build." am:
507df68b78 am:
a9db82bfe9
am:
26edd04c6b
Change-Id: Id4e647422b6e7e42508165a59f48c08d053aec26
Yabin Cui [Wed, 4 Jan 2017 02:09:46 +0000 (02:09 +0000)]
Merge "simpleperf: add binaries in sdk build." am:
507df68b78
am:
a9db82bfe9
Change-Id: Ie87f8e105b4323e3fb0fdfd723735a82d55a80eb
Yabin Cui [Wed, 4 Jan 2017 02:07:44 +0000 (02:07 +0000)]
Merge "simpleperf: add binaries in sdk build."
am:
507df68b78
Change-Id: I567466800dcf0fdae7602f1bd13ea530bea4d35a
Yabin Cui [Wed, 4 Jan 2017 02:02:26 +0000 (02:02 +0000)]
Merge "simpleperf: add binaries in sdk build."
TreeHugger Robot [Tue, 3 Jan 2017 23:07:52 +0000 (23:07 +0000)]
Merge "mkuserimg_mke2fs: fix issues creating images"
Yabin Cui [Mon, 19 Dec 2016 18:28:54 +0000 (10:28 -0800)]
simpleperf: add binaries in sdk build.
Build 32/64 bit simpleperf on target, simpleperf on host,
and libsimpleperf_report.so on host in sdk. So they can
be used in prebuilts/simpleperf.
Bug: http://b/
32834638
Test: make sdk and win_sdk manually.
Change-Id: I1e55c9b1596aca3b982dc30422d29d830077289e
Jaekyun Seok [Wed, 28 Dec 2016 01:41:10 +0000 (01:41 +0000)]
Merge "Use shared lib of libselinux in runconuid instead of static one." am:
3248ec90dc am:
a49a613353 am:
4cc3629f6d
am:
62e3398cf2
Change-Id: I388cafa8c0d0f7393b26fb6fa281fe835b4e2f5d
Jaekyun Seok [Wed, 28 Dec 2016 01:33:10 +0000 (01:33 +0000)]
Merge "Use shared lib of libselinux in runconuid instead of static one." am:
3248ec90dc am:
a49a613353
am:
4cc3629f6d
Change-Id: I7eac801864c6cef233f855c841ac6951e976fb1a
Jaekyun Seok [Wed, 28 Dec 2016 01:25:39 +0000 (01:25 +0000)]
Merge "Use shared lib of libselinux in runconuid instead of static one." am:
3248ec90dc
am:
a49a613353
Change-Id: I27c9ed3df31418720ffe080eb1f27cb547ded43a
Jaekyun Seok [Wed, 28 Dec 2016 01:18:09 +0000 (01:18 +0000)]
Merge "Use shared lib of libselinux in runconuid instead of static one."
am:
3248ec90dc
Change-Id: I18fd202bd200662d2b579d4d10f9a4fbde7254ae
Treehugger Robot [Wed, 28 Dec 2016 01:07:29 +0000 (01:07 +0000)]
Merge "Use shared lib of libselinux in runconuid instead of static one."
The Android Automerger [Wed, 28 Dec 2016 00:34:12 +0000 (00:34 +0000)]
Manually merge commit '
96ace71'
* commit '
96ace71':
kernel.config: aslr test exception in std:stoll
Mark Salyzyn [Tue, 27 Dec 2016 22:36:59 +0000 (22:36 +0000)]
Merge "kernel.config: aslr test exception in std:stoll" am:
55f50c6a4c am:
dbccaa45b5
am:
3ed08f1718
Change-Id: I8793485f3211e834d6461531ae1b374c9c8d03f5
Mark Salyzyn [Tue, 27 Dec 2016 22:29:29 +0000 (22:29 +0000)]
Merge "kernel.config: aslr test exception in std:stoll" am:
55f50c6a4c
am:
dbccaa45b5
Change-Id: I4c83b9c53ae26167696d0aa8114d481a8581848f
Mark Salyzyn [Tue, 27 Dec 2016 22:21:59 +0000 (22:21 +0000)]
Merge "kernel.config: aslr test exception in std:stoll"
am:
55f50c6a4c
Change-Id: Ia46be19245b3d9cfd8fa117614fc0a957cd63bbd
Treehugger Robot [Tue, 27 Dec 2016 22:14:58 +0000 (22:14 +0000)]
Merge "kernel.config: aslr test exception in std:stoll"
Mark Salyzyn [Tue, 27 Dec 2016 20:31:13 +0000 (12:31 -0800)]
kernel.config: aslr test exception in std:stoll
Test: no more exception failures
Bug:
33846158
Change-Id: Iaaa43affae3a42cf5b94bed84ab94197d3d4d2d1
Yifan Hong [Thu, 22 Dec 2016 18:43:54 +0000 (18:43 +0000)]
Merge "Update for hiding Status from Return<T> object." am:
6bf42db77d am:
495022d1d3 am:
83f440739e
am:
47fccea026
Change-Id: If62d1ed0eb914a6272d3d6d185912d735bfd9131
Yifan Hong [Thu, 22 Dec 2016 18:23:37 +0000 (18:23 +0000)]
Merge "Update for hiding Status from Return<T> object." am:
6bf42db77d am:
495022d1d3
am:
83f440739e
Change-Id: Ia6e1d11760d24a6f64956805f2e56849b5e94f15
Yifan Hong [Thu, 22 Dec 2016 18:19:15 +0000 (18:19 +0000)]
Merge "Update for hiding Status from Return<T> object." am:
6bf42db77d
am:
495022d1d3
Change-Id: I0801a914c6f2c902a52b528eb650578853f853a1
Yifan Hong [Thu, 22 Dec 2016 18:16:19 +0000 (18:16 +0000)]
Merge "Update for hiding Status from Return<T> object."
am:
6bf42db77d
Change-Id: I3182b9170f826a9757e0c92b2a63d3f4a7b457d9
Yifan Hong [Thu, 22 Dec 2016 18:04:15 +0000 (18:04 +0000)]
Merge "Update for hiding Status from Return<T> object."
Jin Qian [Thu, 22 Dec 2016 17:53:03 +0000 (09:53 -0800)]
Revert "ioshark: A Repeatable Application Workload Based Storage Benchmark."
This reverts commit
99c8f98f2a9c76fabb19cdbc5b495978cfc479b3.
Change-Id: Id205f175802d55b8f12342f82199db5743e479dc
Jin Qian [Thu, 22 Dec 2016 16:48:32 +0000 (08:48 -0800)]
ioshark: fix mac build break
Change-Id: Iefd18cc8ebfe462231292e30397467410e9f0511
Jin Qian [Thu, 22 Dec 2016 01:24:35 +0000 (17:24 -0800)]
iosharky: fix more build break
Change-Id: I83f0a8b93e1e75b21f6e1de365da411313e71923
Jin Qian [Wed, 21 Dec 2016 22:53:03 +0000 (14:53 -0800)]
ioshark: fix build break
Change-Id: Ief46c02a29a4787191004a5cc2e616175a0384da
Mohan Srinivasan [Wed, 21 Dec 2016 22:18:13 +0000 (22:18 +0000)]
Merge "ioshark: A Repeatable Application Workload Based Storage Benchmark."
Jaekyun Seok [Wed, 21 Dec 2016 05:23:09 +0000 (14:23 +0900)]
Use shared lib of libselinux in runconuid instead of static one.
libselinux is being used as shared lib by many other modules.
So using its shared lib will reduce total image size.
Size diff on angler build image is as follows.
runconuid: 19912 -> 11256 (-8656)
Test: building succeeded, and the image was tested on angler.
Bug:
33056637
Change-Id: I6272486fdacef06c30d25f1718651757d873eb1b
Yifan Hong [Wed, 21 Dec 2016 01:34:36 +0000 (17:34 -0800)]
Update for hiding Status from Return<T> object.
Bug:
31348667
Test: compiles
Change-Id: I31eb72e4e18dca68255a36915fcc980c928936d7
Dan Willemsen [Tue, 20 Dec 2016 21:10:49 +0000 (21:10 +0000)]
Merge "Add system/extras/Android.bp" am:
3a1544a877 am:
3ba28b0083 am:
ef40364f8c
am:
49a30866de
Change-Id: Iaa9494df27cb85af9086af77888a14f72d379b40
Dan Willemsen [Tue, 20 Dec 2016 21:00:48 +0000 (21:00 +0000)]
Merge "Add system/extras/Android.bp" am:
3a1544a877 am:
3ba28b0083
am:
ef40364f8c
Change-Id: Iaa3616d46a3367c68ef919d263b38ef4e3fefffe
Dan Willemsen [Tue, 20 Dec 2016 20:42:09 +0000 (20:42 +0000)]
Merge "Add system/extras/Android.bp" am:
3a1544a877
am:
3ba28b0083
Change-Id: I8a178dd5c5d119a94f9655ab89d80f0f58e68aeb
Dan Willemsen [Tue, 20 Dec 2016 20:33:25 +0000 (20:33 +0000)]
Merge "Add system/extras/Android.bp"
am:
3a1544a877
Change-Id: I7c8be2c5c42c7b175c409a3ae3fd0d94833ecb79
Treehugger Robot [Tue, 20 Dec 2016 20:25:08 +0000 (20:25 +0000)]
Merge "Add system/extras/Android.bp"
Dan Willemsen [Tue, 20 Dec 2016 18:51:52 +0000 (10:51 -0800)]
Add system/extras/Android.bp
Test: Soong's build.ninja identical before/after (except GlobRules)
Change-Id: I541c6bd662bdddbeac6ca6a3ec517e09444fb232
Tao Bao [Sat, 17 Dec 2016 03:11:51 +0000 (03:11 +0000)]
build_verity_metadata: Support --signer_args argument. am:
4506252918 am:
28947f4f29 am:
4c32ff2446
am:
c1839167d8
Change-Id: If5bef407212f394809d884c9b3980a0c2e5718cf
Tao Bao [Sat, 17 Dec 2016 03:11:39 +0000 (03:11 +0000)]
build_verity_metadata: Support --signer_args argument. am:
4506252918 am:
28947f4f29 -s ours am:
0dac2c52dd
am:
b295094ae7
Change-Id: I8aed87b2845afc1d36a4d7bfb15db8c21d2d9dbe
Tao Bao [Sat, 17 Dec 2016 03:09:47 +0000 (03:09 +0000)]
build_verity_metadata: Support --signer_args argument. am:
4506252918 am:
28947f4f29
am:
4c32ff2446
Change-Id: I97360b70b12abc809405a2b2afccddc2b98ade04
Tao Bao [Sat, 17 Dec 2016 02:59:16 +0000 (02:59 +0000)]
build_verity_metadata: Support --signer_args argument. am:
4506252918 am:
28947f4f29 -s ours
am:
0dac2c52dd
Change-Id: I7d90cc8412948a2dd1f5c10697ed0b5879c63699
Tao Bao [Sat, 17 Dec 2016 02:48:23 +0000 (02:48 +0000)]
build_verity_metadata: Support --signer_args argument. am:
4506252918
am:
28947f4f29 -s ours
Change-Id: Ide195547f3148c6d63c1573806e108d3d384f230
Tao Bao [Sat, 17 Dec 2016 02:37:12 +0000 (02:37 +0000)]
build_verity_metadata: Support --signer_args argument. am:
4506252918
am:
28947f4f29
Change-Id: I41c6b642aec4a558a109a7aee87f9c4254e5e2f9
Tao Bao [Sat, 17 Dec 2016 02:27:41 +0000 (02:27 +0000)]
build_verity_metadata: Support --signer_args argument.
am:
4506252918
Change-Id: I08c959ab10b087dddf5035e1773fffab261af314
Tao Bao [Mon, 17 Oct 2016 23:06:31 +0000 (16:06 -0700)]
build_verity_metadata: Support --signer_args argument.
Use argparse to parse input parameters for future extension.
Add 'build' and 'size' as two sub-commands.
- 'build_verity_metadata.py -s SIZE' becomes
'build_verity_metadata.py size SIZE'.
- 'build_verity_metadata.py BLOCKS METADATA_IMAGE ...' becomes
'build_verity_metadata.py build BLOCKS METADATA_IMAGE ...'.
The 'build' command now accepts an optional argument '--signer_args' to
specify signer specific arguments.
Bug:
31500665
Test: Building and signing work w/ and w/o --signer_args.
(cherry picked from commit
39d1756abe66538a6cbdfc4c7b5377ce279e332c)
(cherry picked from commit
1522691d1da02d623bb32619e113954656be39b3)
Change-Id: I4f8f2478458a3a787bd1ba86474330de372458c1
Yabin Cui [Fri, 16 Dec 2016 23:34:43 +0000 (23:34 +0000)]
Merge "simpleperf: merge dumped symbols with symbols read from file system." am:
e96bfe150f am:
b0a4a8467a am:
65ebeaed2c
am:
91af2707c3
Change-Id: I65507e6a1c01844e7b52983f26a595f76ad6365b
Yabin Cui [Fri, 16 Dec 2016 23:24:31 +0000 (23:24 +0000)]
Merge "simpleperf: merge dumped symbols with symbols read from file system." am:
e96bfe150f am:
b0a4a8467a
am:
65ebeaed2c
Change-Id: I2c9b3b98e5634a59c7ba9eb9365c03217a5ddc91
Tao Bao [Fri, 16 Dec 2016 23:18:18 +0000 (23:18 +0000)]
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am:
6727a1e718 am:
9ac16f1f48 am:
8b3b60cbf9 am:
2f8cbf7261
am:
37e4ffabc1
Change-Id: I154d65bef232b2c60ba27601a8da79c500a81e59
Yabin Cui [Fri, 16 Dec 2016 23:16:23 +0000 (23:16 +0000)]
Merge "simpleperf: merge dumped symbols with symbols read from file system." am:
e96bfe150f
am:
b0a4a8467a
Change-Id: Ia7d016ea321ff7dfde9583cadf346a7fcb60c3e8
Yabin Cui [Fri, 16 Dec 2016 23:09:23 +0000 (23:09 +0000)]
Merge "simpleperf: merge dumped symbols with symbols read from file system."
am:
e96bfe150f
Change-Id: Iae08221fa292cc654de37599102925851b845554
Tao Bao [Fri, 16 Dec 2016 23:07:32 +0000 (23:07 +0000)]
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am:
6727a1e718 am:
9ac16f1f48 am:
8b3b60cbf9
am:
2f8cbf7261
Change-Id: I77c0b5490a00dce52ab06c2d12832b3f570dc06e
Tao Bao [Fri, 16 Dec 2016 23:02:04 +0000 (23:02 +0000)]
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am:
6727a1e718 am:
9ac16f1f48 am:
8b3b60cbf9 -s ours am:
2984aca213
am:
09b874ff31
Change-Id: I2050aa51ee3cd719eccc0fc8854436aaadddacc6
Alex Light [Fri, 16 Dec 2016 23:01:46 +0000 (23:01 +0000)]
Merge "merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
96c347a9b9 am:
627cc3afb3 am:
c51d68746c am:
93f8319bc7" into nyc-mr2-dev-plus-aosp
am:
2a99ed4f32
Change-Id: I114503d0e32d8893fd1ddb97c9c6f403aeb7ee0a
Alex Light [Fri, 16 Dec 2016 23:01:45 +0000 (23:01 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
96c347a9b9 am:
627cc3afb3 am:
c51d68746c am:
93f8319bc7
am:
393520d70a
Change-Id: I14123dad24c8f85de43ec9134b1ef64b83cef2e7
Alex Light [Fri, 16 Dec 2016 23:01:33 +0000 (23:01 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
96c347a9b9 am:
627cc3afb3 am:
c51d68746c am:
539556ac79
am:
a40737964a
Change-Id: I8a236339b832456cc25cd122aa152ac07a4068cc
Tao Bao [Fri, 16 Dec 2016 22:58:29 +0000 (22:58 +0000)]
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am:
6727a1e718 am:
9ac16f1f48 am:
8b3b60cbf9 -s ours
am:
2984aca213
Change-Id: I190a9d950f79159be5ab729364aaff3d84ed9bd1
Yabin Cui [Fri, 16 Dec 2016 22:56:28 +0000 (22:56 +0000)]
Merge "simpleperf: merge dumped symbols with symbols read from file system."
Tao Bao [Fri, 16 Dec 2016 22:50:34 +0000 (22:50 +0000)]
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am:
6727a1e718 am:
9ac16f1f48
am:
8b3b60cbf9 -s ours
Change-Id: I9f3531f12a1ad1503650a93175bc02b9a9129db7
Android Build Merger (Role) [Fri, 16 Dec 2016 22:45:57 +0000 (22:45 +0000)]
Merge "merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
96c347a9b9 am:
627cc3afb3 am:
c51d68746c am:
93f8319bc7" into nyc-mr2-dev-plus-aosp
Alex Light [Fri, 16 Dec 2016 22:45:50 +0000 (22:45 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
96c347a9b9 am:
627cc3afb3 am:
c51d68746c
am:
93f8319bc7
Change-Id: If880ae034045c4bb131e77a7a055f9d8656ca731
Alex Light [Fri, 16 Dec 2016 22:45:45 +0000 (22:45 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
96c347a9b9 am:
627cc3afb3 am:
c51d68746c
am:
539556ac79
Change-Id: I01fb922ced6599fa4a56d29950e153b5f1b52821
Tao Bao [Fri, 16 Dec 2016 22:38:09 +0000 (22:38 +0000)]
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am:
6727a1e718 am:
9ac16f1f48
am:
8b3b60cbf9
Change-Id: I7112a6549544245c00cfea6444fdd2f8437521ff
Alex Light [Fri, 16 Dec 2016 22:37:59 +0000 (22:37 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
96c347a9b9 am:
627cc3afb3
am:
c51d68746c
Change-Id: I798399783afb1daccd820921ed382ff9e8d515a9
Alex Light [Fri, 16 Dec 2016 22:37:45 +0000 (22:37 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
96c347a9b9 am:
627cc3afb3
am:
c51d68746c
Change-Id: I28727204b16e0cb6c45a2ab3305fb2913278975c
Tao Bao [Fri, 16 Dec 2016 22:29:30 +0000 (22:29 +0000)]
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am:
6727a1e718
am:
9ac16f1f48
Change-Id: I728adaba03fa4c671a8b04471d9f9f9b78aaf532
Alex Light [Fri, 16 Dec 2016 22:29:22 +0000 (22:29 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
96c347a9b9
am:
627cc3afb3
Change-Id: Ia68bc020f5eb4a97f0c66bd944f27dc0156d4a6d
Tao Bao [Fri, 16 Dec 2016 22:20:39 +0000 (22:20 +0000)]
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev
am:
6727a1e718
Change-Id: I257cedf0b05301148604e4bbfe24b95bd5c5d479
Alex Light [Fri, 16 Dec 2016 22:20:28 +0000 (22:20 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev
am:
96c347a9b9
Change-Id: I9a44b38e4aac14d6c41481ef58637bc873a8f85e
Yabin Cui [Fri, 16 Dec 2016 22:01:00 +0000 (22:01 +0000)]
Merge "simpleperf: use per process maps." am:
c35b5e2d4f am:
e594679674 am:
05cb0b3a48
am:
b42d3daa2a
Change-Id: Ic709bb45b1e58aaadd8fa30e29e32e68a837b568
Yabin Cui [Fri, 16 Dec 2016 21:54:05 +0000 (21:54 +0000)]
Merge "simpleperf: use per process maps." am:
c35b5e2d4f am:
e594679674
am:
05cb0b3a48
Change-Id: Id148d91fb51dc216cda8f1f72a54f10bb32cce86
Yabin Cui [Fri, 16 Dec 2016 21:47:07 +0000 (21:47 +0000)]
Merge "simpleperf: use per process maps." am:
c35b5e2d4f
am:
e594679674
Change-Id: I29d9803bb8f445634f05b1068ad6cc34f2bf6f9b
OSDN Git Service
