OSDN Git Service
Kenny Root [Thu, 22 Oct 2015 00:16:18 +0000 (00:16 +0000)]
Merge "system/extras: remove BORINGSSL_201509 support." am:
b5ff8a9895 am:
3746ef3d16
am:
95c3bcda53
* commit '
95c3bcda530e0c976b6b399d9308ab983f232ba0':
system/extras: remove BORINGSSL_201509 support.
Kenny Root [Thu, 22 Oct 2015 00:13:49 +0000 (00:13 +0000)]
Merge "system/extras: remove BORINGSSL_201509 support." am:
b5ff8a9895
am:
3746ef3d16
* commit '
3746ef3d1662e96e528c30eefcd0504be5d5a2a0':
system/extras: remove BORINGSSL_201509 support.
Kenny Root [Thu, 22 Oct 2015 00:11:39 +0000 (00:11 +0000)]
Merge "system/extras: remove BORINGSSL_201509 support."
am:
b5ff8a9895
* commit '
b5ff8a9895b21da46a7d0c6b082db363e1f9929d':
system/extras: remove BORINGSSL_201509 support.
Kenny Root [Thu, 22 Oct 2015 00:09:39 +0000 (00:09 +0000)]
Merge "system/extras: remove BORINGSSL_201509 support."
Christopher Ferris [Wed, 21 Oct 2015 20:04:03 +0000 (20:04 +0000)]
Merge "Add timing of allocation functions." am:
3d614a17ef am:
77b1d6fcf2
am:
8be4728496
* commit '
8be4728496befae5d54850d32667adca3d16f7e0':
Add timing of allocation functions.
Christopher Ferris [Wed, 21 Oct 2015 20:01:45 +0000 (20:01 +0000)]
Merge "Add timing of allocation functions." am:
3d614a17ef
am:
77b1d6fcf2
* commit '
77b1d6fcf288c3bc06106fc34eca129c8e521c18':
Add timing of allocation functions.
Christopher Ferris [Wed, 21 Oct 2015 19:59:35 +0000 (19:59 +0000)]
Merge "Add timing of allocation functions."
am:
3d614a17ef
* commit '
3d614a17efc2661dc491dafa9a18d20bac1ab964':
Add timing of allocation functions.
Christopher Ferris [Wed, 21 Oct 2015 19:44:14 +0000 (19:44 +0000)]
Merge "Add timing of allocation functions."
Christopher Ferris [Wed, 14 Oct 2015 20:25:15 +0000 (13:25 -0700)]
Add timing of allocation functions.
Report the time it takes to execute every different allocation function
during the replay.
Change-Id: I4e8321409357824c10f2f176b02c7c33538d353b
Elliott Hughes [Wed, 21 Oct 2015 14:49:34 +0000 (14:49 +0000)]
Merge "Fix lseek argument order." am:
5321b63ea2 am:
3d9578316f
am:
7cb0c2d7fd
* commit '
7cb0c2d7fdaa9950ba2103625ef177ef846fc404':
Fix lseek argument order.
Mike Frysinger [Wed, 21 Oct 2015 14:49:20 +0000 (14:49 +0000)]
Merge "brillo_config: add missing mkdir for product rules" am:
01e57b832a am:
5dbfe0ac9e
am:
2b12ab7800
* commit '
2b12ab780083b719fb8605cab2c353366f8123c6':
brillo_config: add missing mkdir for product rules
Sami Tolvanen [Tue, 20 Oct 2015 21:38:10 +0000 (21:38 +0000)]
Merge "libfec: add a function to disable verity" am:
c3788283d7 am:
964746605c
am:
42ca2c65b4
* commit '
42ca2c65b4a14ef2817e017d1203a2c3ca7a0e44':
libfec: add a function to disable verity
Elliott Hughes [Tue, 20 Oct 2015 20:48:31 +0000 (20:48 +0000)]
Merge "Fix lseek argument order." am:
5321b63ea2
am:
3d9578316f
* commit '
3d9578316f5ea702c455e74aceae0a486986e99a':
Fix lseek argument order.
Elliott Hughes [Tue, 20 Oct 2015 20:37:10 +0000 (20:37 +0000)]
Merge "Fix lseek argument order."
am:
5321b63ea2
* commit '
5321b63ea2063e4246543009c763584498d1e56d':
Fix lseek argument order.
Elliott Hughes [Tue, 20 Oct 2015 20:28:29 +0000 (20:28 +0000)]
Merge "Fix lseek argument order."
Mike Frysinger [Tue, 20 Oct 2015 20:18:12 +0000 (20:18 +0000)]
Merge "brillo_config: add missing mkdir for product rules" am:
01e57b832a
am:
5dbfe0ac9e
* commit '
5dbfe0ac9e7ea22cd0cabf94c5d3663980b7254c':
brillo_config: add missing mkdir for product rules
Elliott Hughes [Tue, 20 Oct 2015 20:14:28 +0000 (13:14 -0700)]
Fix lseek argument order.
Change-Id: I782d17a0678d7e74be89c46c42de942129750e55
Mike Frysinger [Tue, 20 Oct 2015 20:11:53 +0000 (20:11 +0000)]
Merge "brillo_config: add missing mkdir for product rules"
am:
01e57b832a
* commit '
01e57b832ab732199824ac6bda0b804eaad62b94':
brillo_config: add missing mkdir for product rules
Mike Frysinger [Tue, 20 Oct 2015 19:25:39 +0000 (19:25 +0000)]
Merge "brillo_config: add missing mkdir for product rules"
Mike Frysinger [Tue, 20 Oct 2015 18:11:47 +0000 (14:11 -0400)]
brillo_config: add missing mkdir for product rules
When doing a clean build, creating this file fails because the dir does
not yet exist:
echo "" > out/target/product/brilloemulator_arm/obj/ETC/product_id_intermediates/product_id
/bin/bash: out/target/product/brilloemulator_arm/obj/ETC/product_id_intermediates/product_id: No such file or directory
BUG:
24585672
Change-Id: I9c4a646b8d86cd303b0114f9b64d02896797f720
Sami Tolvanen [Tue, 20 Oct 2015 14:29:16 +0000 (14:29 +0000)]
Merge "libfec: add a function to disable verity" am:
c3788283d7
am:
964746605c
* commit '
964746605c96b8bea882b6ef173bc4b54e1ddd94':
libfec: add a function to disable verity
Sami Tolvanen [Tue, 20 Oct 2015 14:25:41 +0000 (14:25 +0000)]
Merge "libfec: add a function to disable verity"
am:
c3788283d7
* commit '
c3788283d70eb8b0ad5b9a0e224108262beb84b5':
libfec: add a function to disable verity
Sami Tolvanen [Tue, 20 Oct 2015 14:22:42 +0000 (14:22 +0000)]
Merge "libfec: add a function to disable verity"
Sami Tolvanen [Tue, 20 Oct 2015 12:23:19 +0000 (13:23 +0100)]
libfec: add a function to disable verity
Add fec_verity_set_status to allow disabling verity on userdebug
builds by updating metadata magic.
Change-Id: I02f83b0d1d4e7ef5cd5d13a37ff0b84f17e23376
Dan Albert [Tue, 20 Oct 2015 01:50:23 +0000 (01:50 +0000)]
Merge "Include what we use." am:
78ca45c2bb am:
78371f2edb
am:
46aa52a9f5
* commit '
46aa52a9f5f15bbd17b7fa986326d32fa1a46098':
Include what we use.
Dan Albert [Tue, 20 Oct 2015 01:13:46 +0000 (01:13 +0000)]
Merge "Include what we use." am:
78ca45c2bb
am:
78371f2edb
* commit '
78371f2edb72f54784d71c8b0f3ddeef00cbd8b5':
Include what we use.
Dan Albert [Tue, 20 Oct 2015 00:34:21 +0000 (00:34 +0000)]
Merge "Include what we use."
am:
78ca45c2bb
* commit '
78ca45c2bb2855243bd262581473b20c63f75460':
Include what we use.
Dan Albert [Mon, 19 Oct 2015 23:59:51 +0000 (23:59 +0000)]
Merge "Include what we use."
Dan Albert [Mon, 19 Oct 2015 22:57:14 +0000 (15:57 -0700)]
Include what we use.
libc++ used to leak unistd.h, causing ioctl and close to be leaked. It
doesn't anymore, so actually include this.
Change-Id: I510301a71ea0d9526a4862a634c7726053baa8f8
Sami Tolvanen [Mon, 19 Oct 2015 10:02:18 +0000 (10:02 +0000)]
am
c193701b: am
0d08d778: am
4c033e39: Merge "verity: move metadata after the hash tree"
* commit '
c193701b7d89bcead53468f1ce4e2ba62c9e3032':
verity: move metadata after the hash tree
Sami Tolvanen [Mon, 19 Oct 2015 09:55:23 +0000 (09:55 +0000)]
am
0d08d778: am
4c033e39: Merge "verity: move metadata after the hash tree"
* commit '
0d08d778ea9751da404a300ca59dd88087cc08c1':
verity: move metadata after the hash tree
Sami Tolvanen [Mon, 19 Oct 2015 09:51:57 +0000 (02:51 -0700)]
am
4c033e39: Merge "verity: move metadata after the hash tree"
* commit '
4c033e392e8b8d92f876b8ab46df14e4268d006b':
verity: move metadata after the hash tree
Sami Tolvanen [Mon, 19 Oct 2015 09:49:18 +0000 (09:49 +0000)]
Merge "verity: move metadata after the hash tree"
Joshua Schwarz [Thu, 15 Oct 2015 22:02:09 +0000 (22:02 +0000)]
am
2801c7ce: (-s ours) am
f7023afa: am
e7863296: DO NOT MERGE Update rand_emmc_perf makefile. am:
3c1f6644bf -s ours
* commit '
2801c7ce686a7437ef70979fd7c3753d1330b313':
DO NOT MERGE Update rand_emmc_perf makefile.
Joshua Schwarz [Thu, 15 Oct 2015 21:53:52 +0000 (21:53 +0000)]
am
f7023afa: am
e7863296: DO NOT MERGE Update rand_emmc_perf makefile. am:
3c1f6644bf -s ours
* commit '
f7023afac4595a23e29c7dcb9a6f6a847051551c':
DO NOT MERGE Update rand_emmc_perf makefile.
Joshua Schwarz [Thu, 15 Oct 2015 21:36:52 +0000 (21:36 +0000)]
am
e7863296: DO NOT MERGE Update rand_emmc_perf makefile. am:
3c1f6644bf -s ours
* commit '
e78632961167670b89b797a23426d0c51d4b5592':
DO NOT MERGE Update rand_emmc_perf makefile.
Joshua Schwarz [Thu, 15 Oct 2015 21:31:38 +0000 (21:31 +0000)]
DO NOT MERGE Update rand_emmc_perf makefile.
am:
3c1f6644bf -s ours
* commit '
3c1f6644bfcd810356154670866f7434f986d940':
DO NOT MERGE Update rand_emmc_perf makefile.
Mohamad Ayyash [Thu, 15 Oct 2015 21:19:16 +0000 (21:19 +0000)]
am
78b7722a: am
0b2f8f6c: am
665ae145: Merge "Setup filesystem for automatic forced repair"
* commit '
78b7722a5da28cf5bf036d0166a7c3c636edb834':
Setup filesystem for automatic forced repair
Mohamad Ayyash [Thu, 15 Oct 2015 21:13:17 +0000 (21:13 +0000)]
am
0b2f8f6c: am
665ae145: Merge "Setup filesystem for automatic forced repair"
* commit '
0b2f8f6cdd6bc649c633f92e189b886bc94aca99':
Setup filesystem for automatic forced repair
Mohamad Ayyash [Thu, 15 Oct 2015 21:07:08 +0000 (21:07 +0000)]
am
665ae145: Merge "Setup filesystem for automatic forced repair"
* commit '
665ae145b8f117b9dfb2b4149e358cf25685b829':
Setup filesystem for automatic forced repair
Mohamad Ayyash [Thu, 15 Oct 2015 20:16:03 +0000 (20:16 +0000)]
Merge "Setup filesystem for automatic forced repair"
Andriy Naborskyy [Thu, 15 Oct 2015 19:18:10 +0000 (19:18 +0000)]
am
80afea1e: am
1f55c074: am
d258e0fd: am
83eeed92: emmc test: fix counter overflow
* commit '
80afea1e6831f60662214169d2bb25d668fd499e':
emmc test: fix counter overflow
Andriy Naborskyy [Thu, 15 Oct 2015 19:14:43 +0000 (19:14 +0000)]
am
1f55c074: am
d258e0fd: am
83eeed92: emmc test: fix counter overflow
* commit '
1f55c074400d01d24a03e9154fb2613f1ad8daf3':
emmc test: fix counter overflow
Andriy Naborskyy [Thu, 15 Oct 2015 19:09:50 +0000 (19:09 +0000)]
am
d258e0fd: am
83eeed92: emmc test: fix counter overflow
* commit '
d258e0fd390ac8536d0405589bd0519327721da3':
emmc test: fix counter overflow
Andriy Naborskyy [Thu, 15 Oct 2015 19:04:57 +0000 (19:04 +0000)]
am
83eeed92: emmc test: fix counter overflow
* commit '
83eeed92430fc3f14c21cfc43d11fcecef6e8285':
emmc test: fix counter overflow
Andriy Naborskyy [Thu, 15 Oct 2015 17:33:52 +0000 (10:33 -0700)]
emmc test: fix counter overflow
Fix iops counter overflow that is observed with smaller write size
Bug:
24099467
Change-Id: Ibb1001bde4b68cabf4d0bced6df553f4f772685a
Joshua Schwarz [Thu, 15 Oct 2015 00:21:10 +0000 (17:21 -0700)]
DO NOT MERGE Update rand_emmc_perf makefile.
Change-Id: I4f0416508c3c144e6b44eee4a9dcc78c770dfb8e
Sami Tolvanen [Fri, 25 Sep 2015 13:57:41 +0000 (14:57 +0100)]
verity: move metadata after the hash tree
Move the verity metadata block after the hash tree to make locating
it easier and more reliable.
Needs matching changes from
I6945cbab99e214566a1f9d3702333f2dbbc35816
Change-Id: Ide48f581bbba77aed6132f77b309db71630d81ed
Bertrand Simonnet [Tue, 13 Oct 2015 20:18:15 +0000 (20:18 +0000)]
am
bd8a8737: am
c994a994: Merge "Add an Android.mk to generate build time configuration."
* commit '
bd8a8737467c946d87757782aea697f170c3f1ee':
Add an Android.mk to generate build time configuration.
Bertrand Simonnet [Tue, 13 Oct 2015 20:03:05 +0000 (20:03 +0000)]
am
c994a994: Merge "Add an Android.mk to generate build time configuration."
* commit '
c994a994527392760df16ab812cbbbf8cca5f61d':
Add an Android.mk to generate build time configuration.
Bertrand Simonnet [Tue, 13 Oct 2015 19:58:46 +0000 (19:58 +0000)]
Merge "Add an Android.mk to generate build time configuration."
Bertrand SIMONNET [Thu, 8 Oct 2015 20:06:35 +0000 (13:06 -0700)]
Add an Android.mk to generate build time configuration.
Some build time variables need to be installed on the image. Instead of
adding those fields in some system services, create a new Android.mk for
it.
BUG:
24585672
Change-Id: Ia4132ef7a200e7839702fe10f878b70cc4dfff43
Sami Tolvanen [Tue, 13 Oct 2015 14:03:47 +0000 (14:03 +0000)]
am
b34d8960: am
a43f3854: Merge "slideshow: Switch to android::uptimeMillis"
* commit '
b34d8960465ed5c7d8d451adf025176be6090d41':
slideshow: Switch to android::uptimeMillis
Sami Tolvanen [Tue, 13 Oct 2015 14:03:47 +0000 (14:03 +0000)]
am
2b98f460: am
004019d7: Merge "slideshow: Filter out non key events"
* commit '
2b98f46082c4727c576aa17d6012d5f5a4f75744':
slideshow: Filter out non key events
Sami Tolvanen [Tue, 13 Oct 2015 13:54:36 +0000 (13:54 +0000)]
am
a43f3854: Merge "slideshow: Switch to android::uptimeMillis"
* commit '
a43f3854c60508e00b05201e91dee7571afd3a95':
slideshow: Switch to android::uptimeMillis
Sami Tolvanen [Tue, 13 Oct 2015 13:54:35 +0000 (13:54 +0000)]
am
004019d7: Merge "slideshow: Filter out non key events"
* commit '
004019d71a6a27c8540b61df2c46383ab26df0f2':
slideshow: Filter out non key events
Sami Tolvanen [Tue, 13 Oct 2015 13:52:11 +0000 (13:52 +0000)]
Merge "slideshow: Switch to android::uptimeMillis"
Sami Tolvanen [Tue, 13 Oct 2015 13:51:45 +0000 (13:51 +0000)]
Merge "slideshow: Filter out non key events"
Johan Redestig [Mon, 12 Oct 2015 08:24:30 +0000 (10:24 +0200)]
slideshow: Switch to android::uptimeMillis
time(2) is not guaranteed to always go forward which makes
it a bit dangerous to use in loops like slideshow does.
switch to uptimeMillis which is based on clock_gettime
CLOCK_MONOTONIC which is is safe.
Change-Id: Ica1b7ee50df00fcc7bc849d7eaebe64f62434a47
Johan Redestig [Fri, 9 Oct 2015 11:25:39 +0000 (13:25 +0200)]
slideshow: Filter out non key events
The driver could send EV_SYN events which need
to be filtered out, otherwise we would change
image too soon.
Change-Id: I954e8a4f228da4165a7af3fa544e95a22390a35b
Yabin Cui [Sat, 10 Oct 2015 05:40:03 +0000 (05:40 +0000)]
am
7b95c1e1: am
f7b1a8f3: Merge "Simpleperf: add runtest for callgraph."
* commit '
7b95c1e1e63d3b40379a013d8338c72f1602d9f7':
Simpleperf: add runtest for callgraph.
Yabin Cui [Sat, 10 Oct 2015 05:29:52 +0000 (05:29 +0000)]
am
f7b1a8f3: Merge "Simpleperf: add runtest for callgraph."
* commit '
f7b1a8f34349291589f7c4dd255c838454bb53d4':
Simpleperf: add runtest for callgraph.
Yabin Cui [Sat, 10 Oct 2015 05:24:10 +0000 (05:24 +0000)]
Merge "Simpleperf: add runtest for callgraph."
Yabin Cui [Thu, 8 Oct 2015 18:42:55 +0000 (11:42 -0700)]
Simpleperf: add runtest for callgraph.
Bug:
22885658
Change-Id: Ief8d0f1462f78ceae76a10c3effbbe66e0b3b6c1
Sami Tolvanen [Fri, 9 Oct 2015 09:54:44 +0000 (09:54 +0000)]
am
a27b6773: am
5ba0af50: Merge "slideshow: Trigger on key down only"
* commit '
a27b677327062d082a8a08fb62453c35b380ae8e':
slideshow: Trigger on key down only
Sami Tolvanen [Fri, 9 Oct 2015 09:54:44 +0000 (09:54 +0000)]
am
b0f1f0cd: am
9ba7a526: Merge "slideshow: Dont crash when -t is used"
* commit '
b0f1f0cd9ab416342812e8f2f94e15a1d8c7a399':
slideshow: Dont crash when -t is used
Sami Tolvanen [Fri, 9 Oct 2015 09:45:10 +0000 (09:45 +0000)]
am
5ba0af50: Merge "slideshow: Trigger on key down only"
* commit '
5ba0af509c4a9161debcfe38276953ae04f54eeb':
slideshow: Trigger on key down only
Sami Tolvanen [Fri, 9 Oct 2015 09:45:09 +0000 (09:45 +0000)]
am
9ba7a526: Merge "slideshow: Dont crash when -t is used"
* commit '
9ba7a526f61906845c8e9f79b1495f0162fe62a6':
slideshow: Dont crash when -t is used
Sami Tolvanen [Fri, 9 Oct 2015 09:41:02 +0000 (09:41 +0000)]
Merge "slideshow: Trigger on key down only"
Sami Tolvanen [Fri, 9 Oct 2015 09:40:52 +0000 (09:40 +0000)]
Merge "slideshow: Dont crash when -t is used"
Johan Redestig [Fri, 9 Oct 2015 08:37:37 +0000 (10:37 +0200)]
slideshow: Dont crash when -t is used
Change-Id: I68764b86ad05afb3853ed753a28b4a53580cb68c
Johan Redestig [Fri, 9 Oct 2015 07:54:57 +0000 (09:54 +0200)]
slideshow: Trigger on key down only
Currently slideshow reacts to both key down and release
events which makes the last image just flicker very
briefly.
Change-Id: I5b3215eacf127a7c739826af313c6e1fd0732775
Yabin Cui [Thu, 8 Oct 2015 22:19:40 +0000 (22:19 +0000)]
am
8417f2b6: am
cecf6df6: Merge "Simpleperf: add a simple gui interface for report command."
* commit '
8417f2b66efd820c96ed4c00a27f3e451689c84f':
Simpleperf: add a simple gui interface for report command.
Yabin Cui [Thu, 8 Oct 2015 22:08:29 +0000 (22:08 +0000)]
am
cecf6df6: Merge "Simpleperf: add a simple gui interface for report command."
* commit '
cecf6df6f892e3d5ab34b839c3d355cb83c5d692':
Simpleperf: add a simple gui interface for report command.
Yabin Cui [Thu, 8 Oct 2015 21:44:34 +0000 (21:44 +0000)]
Merge "Simpleperf: add a simple gui interface for report command."
Yabin Cui [Tue, 6 Oct 2015 21:14:39 +0000 (14:14 -0700)]
Simpleperf: add a simple gui interface for report command.
Change-Id: Ie3293a3f223117bd2dc2b398d0a96f9df8cf484b
Yabin Cui [Tue, 6 Oct 2015 22:19:01 +0000 (22:19 +0000)]
am
395eaf95: am
b1f20fa4: Merge "Simpleperf: do dwarf unwinding in record command."
* commit '
395eaf95ff783a600bcbde78e3577fb54af65cde':
Simpleperf: do dwarf unwinding in record command.
Yabin Cui [Tue, 6 Oct 2015 22:15:35 +0000 (22:15 +0000)]
am
b1f20fa4: Merge "Simpleperf: do dwarf unwinding in record command."
* commit '
b1f20fa48b65b2f03f9303ffa2aa381cd1d3dd6f':
Simpleperf: do dwarf unwinding in record command.
Yabin Cui [Tue, 6 Oct 2015 22:02:30 +0000 (22:02 +0000)]
Merge "Simpleperf: do dwarf unwinding in record command."
Yabin Cui [Tue, 6 Oct 2015 21:33:57 +0000 (21:33 +0000)]
am
f1158a8f: am
d210ccde: Merge "Simpleperf: add runtest."
* commit '
f1158a8f6d41d12f3749b12d54a989e54a86b7e6':
Simpleperf: add runtest.
Yabin Cui [Tue, 6 Oct 2015 21:21:00 +0000 (21:21 +0000)]
am
d210ccde: Merge "Simpleperf: add runtest."
* commit '
d210ccde345d11dd56f6239e8427d66754b6026c':
Simpleperf: add runtest.
Yabin Cui [Tue, 6 Oct 2015 21:03:50 +0000 (21:03 +0000)]
Merge "Simpleperf: add runtest."
Yabin Cui [Fri, 2 Oct 2015 00:24:07 +0000 (17:24 -0700)]
Simpleperf: add runtest.
Bug:
22885658
Change-Id: If710c215340665a8fa7d7bfdcd5a6686598cccbd
Sami Tolvanen [Mon, 5 Oct 2015 09:12:55 +0000 (09:12 +0000)]
am
0cb579b3: am
6ddfa666: am
92e11ea1: Merge "Add NOTICE files"
* commit '
0cb579b362087bc8ce200acb1ae178d7a40ae442':
Add NOTICE files
Sami Tolvanen [Mon, 5 Oct 2015 09:08:16 +0000 (09:08 +0000)]
am
6ddfa666: am
92e11ea1: Merge "Add NOTICE files"
* commit '
6ddfa666333f43f2f2961ceb3774440143f1ee98':
Add NOTICE files
Sami Tolvanen [Mon, 5 Oct 2015 09:03:48 +0000 (09:03 +0000)]
am
92e11ea1: Merge "Add NOTICE files"
* commit '
92e11ea1b900fc89cf98604a9e2ebb5c7d570a01':
Add NOTICE files
Sami Tolvanen [Mon, 5 Oct 2015 08:04:54 +0000 (08:04 +0000)]
Merge "Add NOTICE files"
Adam Langley [Sat, 3 Oct 2015 00:32:23 +0000 (00:32 +0000)]
am
35ee1587: am
241ffafa: Prepare for BoringSSL update.
* commit '
35ee1587b2882fb712956b34d44e81486578fbca':
Prepare for BoringSSL update.
Adam Langley [Sat, 3 Oct 2015 00:28:03 +0000 (00:28 +0000)]
am
241ffafa: Prepare for BoringSSL update.
* commit '
241ffafa8ef52a503e7aaee31ead8c898c1b4126':
Prepare for BoringSSL update.
Adam Langley [Wed, 2 Sep 2015 22:45:12 +0000 (15:45 -0700)]
Prepare for BoringSSL update.
This change tweaks things as needed so that the code will compile
against both the BoringSSL that's currently in Android and a version
from upstream. The BORINGSSL_201509 define is temporary to allow the
switch to happen without breaking the build and a followup change will
remove it.
In this case, we backed off on removing |ERR_print_errors|, despite it
being a wart in the layering of the code.
(cherry picked from commit
7a688f6e8774920cb8cfc52bf2e3c16976e8ff23)
Change-Id: I2f2f567cfc37fe2d5a69742302c5a92d289b814f
Yabin Cui [Thu, 1 Oct 2015 00:22:35 +0000 (17:22 -0700)]
Simpleperf: do dwarf unwinding in record command.
As libbacktrace only supports unwinding for the same architecture it is running on, simpleperf
report command running on host can't unwind perf.data collected on device. So we'd better do
unwinding work in record command on device.
Bug:
22229391
Change-Id: I085ca074ea83dab79f08563523bdbc7a36650a64
Sami Tolvanen [Fri, 2 Oct 2015 08:18:08 +0000 (09:18 +0100)]
Add NOTICE files
Bug:
24571219
Change-Id: Ib7a4374974c2d0d9225caa1e43d0b78251a36bd2
Yabin Cui [Thu, 1 Oct 2015 19:41:04 +0000 (19:41 +0000)]
am
8db95c96: am
8f9dfc5e: am
eac5440e: Merge "Simpleperf: warn if it can\'t read kernel symbols addresses."
* commit '
8db95c9669927dfda951c6d7a3713bdefb59204c':
Simpleperf: warn if it can't read kernel symbols addresses.
Yabin Cui [Thu, 1 Oct 2015 19:09:41 +0000 (19:09 +0000)]
am
8f9dfc5e: am
eac5440e: Merge "Simpleperf: warn if it can\'t read kernel symbols addresses."
* commit '
8f9dfc5e5af5c833e78d8caff2cd538ee6807aad':
Simpleperf: warn if it can't read kernel symbols addresses.
Yabin Cui [Thu, 1 Oct 2015 19:02:28 +0000 (19:02 +0000)]
am
eac5440e: Merge "Simpleperf: warn if it can\'t read kernel symbols addresses."
* commit '
eac5440e1fcff3ba0b5ed0779f962e9405918e06':
Simpleperf: warn if it can't read kernel symbols addresses.
Yabin Cui [Thu, 1 Oct 2015 18:55:38 +0000 (18:55 +0000)]
Merge "Simpleperf: warn if it can't read kernel symbols addresses."
Yabin Cui [Thu, 1 Oct 2015 18:32:44 +0000 (11:32 -0700)]
Simpleperf: warn if it can't read kernel symbols addresses.
And a little format adjustment.
Bug:
24404256
Change-Id: Ie8dcd37138a693df18101d415e6e3243f4963582
Adam Langley [Wed, 30 Sep 2015 22:03:46 +0000 (15:03 -0700)]
system/extras: remove BORINGSSL_201509 support.
The BORINGSSL_201509 define was used to make updating BoringSSL in
external/boringssl less painful. It allowed code to compile with either
the old BoringSSL (which didn't define BORINGSSL_201509) or with the new
(which does).
Now that the new version has landed, this change removes that support.
Change-Id: I19e661419f830459d015bf14e7905af2ec41b735
Sami Tolvanen [Tue, 29 Sep 2015 13:23:21 +0000 (13:23 +0000)]
am
4d2a0a27: am
66059d6a: am
482fe9e3: Merge "fec: enable building on Mac"
* commit '
4d2a0a277b5f97619947ba397ada7663ee11a46b':
fec: enable building on Mac
Sami Tolvanen [Tue, 29 Sep 2015 13:17:50 +0000 (13:17 +0000)]
am
66059d6a: am
482fe9e3: Merge "fec: enable building on Mac"
* commit '
66059d6acd45ad1e674db44f5bd90fc36d5f87e9':
fec: enable building on Mac
OSDN Git Service
