OSDN Git Service
Robert Carr [Tue, 24 May 2016 23:30:01 +0000 (23:30 +0000)]
Merge "Merge "SF: Force empty sync transactions to apply anyway" into nyc-dev am:
7443c1f253 am:
424d8325fe" into nyc-mr1-dev-plus-aosp
am:
f7b9e4bbd5
* commit '
f7b9e4bbd5b9315019831c373165760f8dfcb8de':
Change-Id: Ia65bf91b10a563e37f8ad4201e4a7791b0e61732
Robert Carr [Tue, 24 May 2016 23:29:59 +0000 (23:29 +0000)]
Merge "SF: Force empty sync transactions to apply anyway" into nyc-dev am:
7443c1f253 am:
2d10b6df79
am:
864652f92f
* commit '
864652f92f498b867b593acce5c7a79a55075f40':
SF: Force empty sync transactions to apply anyway
Change-Id: Ib26d08538b9d9fbe953a601208c90ece61126e12
Android Build Merger (Role) [Tue, 24 May 2016 23:26:18 +0000 (23:26 +0000)]
Merge "Merge "SF: Force empty sync transactions to apply anyway" into nyc-dev am:
7443c1f253 am:
424d8325fe" into nyc-mr1-dev-plus-aosp
Robert Carr [Tue, 24 May 2016 23:26:09 +0000 (23:26 +0000)]
Merge "SF: Force empty sync transactions to apply anyway" into nyc-dev am:
7443c1f253
am:
424d8325fe
* commit '
424d8325fe0b26665631782e2f47321d0ced8595':
SF: Force empty sync transactions to apply anyway
Change-Id: I919dfae1ca1c7277029580911406daeb2d482f70
Robert Carr [Tue, 24 May 2016 23:26:06 +0000 (23:26 +0000)]
Merge "SF: Force empty sync transactions to apply anyway" into nyc-dev am:
7443c1f253
am:
2d10b6df79
* commit '
2d10b6df7935022c3d1483e284adb6bcb03d0d2b':
SF: Force empty sync transactions to apply anyway
Change-Id: I3cb8c29467fd5d882a2bb1ff664cbb340cfb98be
Robert Carr [Tue, 24 May 2016 23:23:29 +0000 (23:23 +0000)]
Merge "SF: Force empty sync transactions to apply anyway" into nyc-dev
am:
7443c1f253
* commit '
7443c1f253008acd868af1e35449dd5eb3139c8d':
SF: Force empty sync transactions to apply anyway
Change-Id: Iaa91350ba6e499d145e7adfcc1874601fff33775
Robert Carr [Tue, 24 May 2016 23:22:41 +0000 (23:22 +0000)]
Merge "SF: Force empty sync transactions to apply anyway" into nyc-dev
am:
7443c1f253
* commit '
7443c1f253008acd868af1e35449dd5eb3139c8d':
SF: Force empty sync transactions to apply anyway
Change-Id: Ic5b1f24f75027800429641eb3c2879a5742e130d
TreeHugger Robot [Tue, 24 May 2016 23:15:00 +0000 (23:15 +0000)]
Merge "SF: Force empty sync transactions to apply anyway" into nyc-dev
Robert Carr [Tue, 24 May 2016 18:41:28 +0000 (11:41 -0700)]
SF: Force empty sync transactions to apply anyway
Following the change to not flush transactions in the screen shot
path, this enables the use of empty synchronous transactions as a
flush mechanism for previous asynchronous transactions.
Bug:
27098060
Change-Id: I282fdfffb72db148edcbf1ded65b15816fc714a2
Mark Salyzyn [Tue, 24 May 2016 20:28:38 +0000 (20:28 +0000)]
resolve merge conflicts of
1750081 to nyc-dev-plus-aosp am:
261a733906
am:
718e76198b
* commit '
718e76198b4fd94a94d5620d1a8785d0c319e612':
dumpstate: sscanf requires an asciiz string
Change-Id: I298d26bf09933048ffbb3f48dc905498de46adc2
Mark Salyzyn [Tue, 24 May 2016 20:17:53 +0000 (20:17 +0000)]
resolve merge conflicts of
1750081 to nyc-dev-plus-aosp
am:
261a733906
* commit '
261a733906981fc2390f0803effdc55c51842a5c':
dumpstate: sscanf requires an asciiz string
Change-Id: I1e4dbbfe6056023dedf954059422c321b3b80680
Mark Salyzyn [Tue, 24 May 2016 19:38:40 +0000 (12:38 -0700)]
resolve merge conflicts of
1750081 to nyc-dev-plus-aosp
Change-Id: If25f336cfc2fa02cba863987da6f55647636417e
Mark Salyzyn [Tue, 24 May 2016 19:01:48 +0000 (19:01 +0000)]
Merge "dumpstate: sscanf requires an asciiz string"
am:
8b10517602
* commit '
8b105176024f4349755300d5903ed1b074fd4b9a':
dumpstate: sscanf requires an asciiz string
Change-Id: Iad314a7bfcbfd29ca95a0c8a76e52f8b894d04e2
Treehugger Robot [Tue, 24 May 2016 18:54:40 +0000 (18:54 +0000)]
Merge "dumpstate: sscanf requires an asciiz string"
Dan Stoza [Tue, 24 May 2016 18:47:16 +0000 (18:47 +0000)]
Merge "SF: Remove forced transaction on screenshot" into nyc-dev am:
854071a38f am:
c51e7ff96d
am:
79cee840dc
* commit '
79cee840dcaee09851a800fcd0f6544473c701a5':
Change-Id: I40ab84d86100e3b5477ece8d9e70f5daaa463ae1
Dan Stoza [Tue, 24 May 2016 18:47:15 +0000 (18:47 +0000)]
Merge "SF: Remove forced transaction on screenshot" into nyc-dev am:
854071a38f am:
7c1e3865a9
am:
4a8ac7cb46
* commit '
4a8ac7cb46500538b964bc8247ff3159fb65d9f5':
SF: Remove forced transaction on screenshot
Change-Id: Id3378fca35a988b475ec06e4888c5883cbeacac4
Dan Stoza [Tue, 24 May 2016 18:46:00 +0000 (18:46 +0000)]
Merge "SF: Remove forced transaction on screenshot" into nyc-dev am:
854071a38f
am:
c51e7ff96d
* commit '
c51e7ff96d97cdcdd420f54df2c3171c1016b14b':
Change-Id: If1b158d525e8d9367c3d1ddc408695a613175e71
Dan Stoza [Tue, 24 May 2016 18:30:59 +0000 (18:30 +0000)]
Merge "SF: Remove forced transaction on screenshot" into nyc-dev am:
854071a38f
am:
7c1e3865a9
* commit '
7c1e3865a90084ae2a3efc089e4499e73d3858e7':
SF: Remove forced transaction on screenshot
Change-Id: I5d38586de3bf2d0bb7236383cd27f04fdbf75ae1
Dan Stoza [Tue, 24 May 2016 18:18:16 +0000 (18:18 +0000)]
Merge "SF: Remove forced transaction on screenshot" into nyc-dev
am:
854071a38f
* commit '
854071a38f250bd0638f1dfdb99b9ccc0010e7d0':
SF: Remove forced transaction on screenshot
Change-Id: I79297918957661befdec24345bdfff2720433188
Dan Stoza [Tue, 24 May 2016 18:18:08 +0000 (18:18 +0000)]
Merge "SF: Remove forced transaction on screenshot" into nyc-dev
am:
854071a38f
* commit '
854071a38f250bd0638f1dfdb99b9ccc0010e7d0':
SF: Remove forced transaction on screenshot
Change-Id: I2a321e5ddef0fd8b4dd5b3cb3a1e409c6998cd5e
Chih-hung Hsieh [Tue, 24 May 2016 18:08:26 +0000 (18:08 +0000)]
Merge "Fix misc-macro-parentheses warnings in libs/binder." am:
44d29d4d07 am:
26c812f077 am:
81ace2ff3e
am:
0617bf2c6f
* commit '
0617bf2c6f2667765c75d78b9e3ff477677a2c3b':
Fix misc-macro-parentheses warnings in libs/binder.
Change-Id: I0845ab4cd285e014ea1bd5f5057291f76efd042d
Adam Buchbinder [Tue, 24 May 2016 18:07:19 +0000 (18:07 +0000)]
Merge "Add missing va_end() calls in some variadic functions."
Chih-Hung Hsieh [Tue, 24 May 2016 18:01:44 +0000 (18:01 +0000)]
Merge "Fix misc-macro-parentheses warnings in libs/binder." am:
44d29d4d07 am:
26c812f077
am:
81ace2ff3e
* commit '
81ace2ff3eeace0c121a3c4e6cf097881cf551f4':
Fix misc-macro-parentheses warnings in libs/binder.
Change-Id: I2621206bc58fc0868f03cd88ce8f55718be15ec6
Dan Stoza [Tue, 24 May 2016 18:01:24 +0000 (18:01 +0000)]
Merge "SF: Remove forced transaction on screenshot" into nyc-dev
Chih-hung Hsieh [Tue, 24 May 2016 17:54:48 +0000 (17:54 +0000)]
Merge "Fix misc-macro-parentheses warnings in libs/binder." am:
44d29d4d07
am:
26c812f077
* commit '
26c812f0774e42d4ab0f90f5448412151bb33367':
Fix misc-macro-parentheses warnings in libs/binder.
Change-Id: I6e9aac1e7373a866b0a5e853d0012a928d9abaa0
Chih-Hung Hsieh [Tue, 24 May 2016 17:48:46 +0000 (17:48 +0000)]
Merge "Fix misc-macro-parentheses warnings in libs/binder."
am:
44d29d4d07
* commit '
44d29d4d07a1262afaf84374ef136e30f24f491d':
Fix misc-macro-parentheses warnings in libs/binder.
Change-Id: I4619aac41c494bd01dd5ffa8279853ecf8719709
Dan Stoza [Tue, 24 May 2016 17:48:02 +0000 (17:48 +0000)]
Merge "HWC2: Fix breakage from header change" into nyc-dev am:
80bc52aefa am:
b66ee0e7d1
am:
6d98e0cdfb
* commit '
6d98e0cdfba102db95e9cf69a58ebbee65c510ee':
Change-Id: I9ad01681eb2420e0c5798db97a26cc6fe4b3f015
Dan Stoza [Tue, 24 May 2016 17:47:45 +0000 (17:47 +0000)]
Merge "HWC2: Fix breakage from header change" into nyc-dev am:
80bc52aefa am:
fce9f9cfce
am:
8827b8a75e
* commit '
8827b8a75eb858ae3778fb491b136a4a029107a4':
HWC2: Fix breakage from header change
Change-Id: I282f18bdaccc9c792ec967775bf4779f6d91ed2c
Chih-hung Hsieh [Tue, 24 May 2016 17:38:21 +0000 (17:38 +0000)]
Merge "Fix misc-macro-parentheses warnings in libs/binder."
Dan Stoza [Tue, 24 May 2016 17:32:25 +0000 (17:32 +0000)]
Merge "HWC2: Fix breakage from header change" into nyc-dev am:
80bc52aefa
am:
b66ee0e7d1
* commit '
b66ee0e7d1553fc1e99abe72407914c18590490c':
Change-Id: I8753accf37084e31ec600b49d116e8f68410e3e5
Dan Stoza [Tue, 24 May 2016 17:29:08 +0000 (17:29 +0000)]
Merge "HWC2: Fix breakage from header change" into nyc-dev am:
80bc52aefa
am:
fce9f9cfce
* commit '
fce9f9cfce0549703e3ee79bc143ce6736b520a3':
HWC2: Fix breakage from header change
Change-Id: Ia891a07108bbefc8bd2782e74a86e41cf164124d
Dan Stoza [Tue, 24 May 2016 17:22:37 +0000 (17:22 +0000)]
Merge "HWC2: Fix breakage from header change" into nyc-dev
am:
80bc52aefa
* commit '
80bc52aefa56e590f05bc30ff0182d860f00b128':
HWC2: Fix breakage from header change
Change-Id: I02f8b45ded3d00dc2d34689f5b902d77ee74ca1e
Dan Stoza [Tue, 24 May 2016 17:14:24 +0000 (17:14 +0000)]
Merge "HWC2: Fix breakage from header change" into nyc-dev
am:
80bc52aefa
* commit '
80bc52aefa56e590f05bc30ff0182d860f00b128':
HWC2: Fix breakage from header change
Change-Id: I05e5ac7285d232074ac336611cbc14643aac9f6e
Dan Stoza [Tue, 24 May 2016 16:55:43 +0000 (16:55 +0000)]
Merge "HWC2: Fix breakage from header change" into nyc-dev
Lajos Molnar [Tue, 24 May 2016 14:42:53 +0000 (14:42 +0000)]
Merge "stagefright: define mpeg2 HighP level constant am:
9e332babb9 am:
6c25a7752d" into nyc-mr1-dev-plus-aosp
am:
a7a5c34c54
* commit '
a7a5c34c54ea618425645f5c067ac56a36038268':
Change-Id: I082ef0cbaa0bb90f42a964360dcfd5bcfa26d923
Lajos Molnar [Tue, 24 May 2016 14:42:52 +0000 (14:42 +0000)]
stagefright: define mpeg2 HighP level constant am:
9e332babb9 am:
e736deaad3
am:
9730aee854
* commit '
9730aee854a9cb3b67bdb423c8a7082dda1cfe06':
stagefright: define mpeg2 HighP level constant
Change-Id: I676558b9895065ec774abb70757f6eda2f88d68a
Android Build Merger (Role) [Tue, 24 May 2016 14:28:36 +0000 (14:28 +0000)]
Merge "stagefright: define mpeg2 HighP level constant am:
9e332babb9 am:
6c25a7752d" into nyc-mr1-dev-plus-aosp
Lajos Molnar [Tue, 24 May 2016 14:28:27 +0000 (14:28 +0000)]
stagefright: define mpeg2 HighP level constant am:
9e332babb9
am:
6c25a7752d
* commit '
6c25a7752deb1facfdd510901292af72fae7c8e9':
stagefright: define mpeg2 HighP level constant
Change-Id: I3ed8776eaa21ab91e307a803dc0e267558e7750a
Lajos Molnar [Tue, 24 May 2016 14:28:26 +0000 (14:28 +0000)]
stagefright: define mpeg2 HighP level constant am:
9e332babb9
am:
e736deaad3
* commit '
e736deaad35afad2cd797c098e1bcfd55c3126b7':
stagefright: define mpeg2 HighP level constant
Change-Id: Ic21b0fea2e0ef30ca577ee5a34cc6e1d6f800f59
Lajos Molnar [Tue, 24 May 2016 14:24:10 +0000 (14:24 +0000)]
stagefright: define mpeg2 HighP level constant
am:
9e332babb9
* commit '
9e332babb92d329c3c9b2e58fef77252cc11e52b':
stagefright: define mpeg2 HighP level constant
Change-Id: I4db62224022bccc89ee4fdda2e32813a1f1c074d
Lajos Molnar [Tue, 24 May 2016 14:24:10 +0000 (14:24 +0000)]
stagefright: define mpeg2 HighP level constant
am:
9e332babb9
* commit '
9e332babb92d329c3c9b2e58fef77252cc11e52b':
stagefright: define mpeg2 HighP level constant
Change-Id: I63bd7d0750a47d3664c7718b8f0bf6bcc8933e4a
Lajos Molnar [Tue, 24 May 2016 14:02:01 +0000 (07:02 -0700)]
stagefright: define mpeg2 HighP level constant
Bug:
28671284
Change-Id: Ic97fd9c3cb4ce04f9cfcd18a4daf68db3349694b
Chia-I Wu [Tue, 24 May 2016 01:29:40 +0000 (01:29 +0000)]
Merge "vulkan: advertise VK_EXT_debug_report am:
319382517a am:
13146c3ab3" into nyc-mr1-dev-plus-aosp
am:
9b90b1b338
* commit '
9b90b1b338b41ad1c4a07e2b62d7ab02323c0024':
Change-Id: I6ea3869a066adf018adef38734d3d0e933cc4421
Chia-I Wu [Tue, 24 May 2016 01:29:39 +0000 (01:29 +0000)]
Merge "vulkan: add a wrapper for hwvulkan_device_t am:
31b2e4f01d am:
e36ffe1f14" into nyc-mr1-dev-plus-aosp
am:
9620a4d76c
* commit '
9620a4d76c6648045af99e5de4756ca62e228b1d':
Change-Id: I5ced2241de8c5424bd941c6f08e651bd0b3bf817
Chia-I Wu [Tue, 24 May 2016 01:29:38 +0000 (01:29 +0000)]
vulkan: advertise VK_EXT_debug_report am:
319382517a am:
02ebed720d
am:
6ac73358a5
* commit '
6ac73358a565f195e83b4173306e157dd95a3a3d':
vulkan: advertise VK_EXT_debug_report
Change-Id: I7964fd954cc9b86bd9402e8e77aba18d0be8ce8c
Chia-I Wu [Tue, 24 May 2016 01:29:37 +0000 (01:29 +0000)]
vulkan: add a wrapper for hwvulkan_device_t am:
31b2e4f01d am:
3e17701da8
am:
6fadda42fb
* commit '
6fadda42fb164011c582a6312e88e365a58874b6':
vulkan: add a wrapper for hwvulkan_device_t
Change-Id: Id385bea627a33aa6054d499df4395f1649db7679
Android Build Merger (Role) [Tue, 24 May 2016 01:27:28 +0000 (01:27 +0000)]
Merge "vulkan: advertise VK_EXT_debug_report am:
319382517a am:
13146c3ab3" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 24 May 2016 01:27:25 +0000 (01:27 +0000)]
Merge "vulkan: add a wrapper for hwvulkan_device_t am:
31b2e4f01d am:
e36ffe1f14" into nyc-mr1-dev-plus-aosp
Chia-I Wu [Tue, 24 May 2016 01:27:09 +0000 (01:27 +0000)]
vulkan: advertise VK_EXT_debug_report am:
319382517a
am:
02ebed720d
* commit '
02ebed720dd9f30ffb75ea0409b26ba7664f54cc':
vulkan: advertise VK_EXT_debug_report
Change-Id: Iea841b096d3e3f834f4e489a556ba001435e1436
Chia-I Wu [Tue, 24 May 2016 01:27:09 +0000 (01:27 +0000)]
vulkan: add a wrapper for hwvulkan_device_t am:
31b2e4f01d
am:
3e17701da8
* commit '
3e17701da844db5be62bc6ceebac8ebc19265dab':
vulkan: add a wrapper for hwvulkan_device_t
Change-Id: I98f86690006e38cdbb7d93a873724fd0818590c6
Chia-I Wu [Tue, 24 May 2016 01:27:09 +0000 (01:27 +0000)]
vulkan: advertise VK_EXT_debug_report am:
319382517a
am:
13146c3ab3
* commit '
13146c3ab31c3cb3b56f9d3e4ff2f1ddd9eaed22':
vulkan: advertise VK_EXT_debug_report
Change-Id: Idd00cedc6db2ea41ed5bd295c06722786cf1bd2b
Chia-I Wu [Tue, 24 May 2016 01:27:09 +0000 (01:27 +0000)]
vulkan: add a wrapper for hwvulkan_device_t am:
31b2e4f01d
am:
e36ffe1f14
* commit '
e36ffe1f14048a312bde9b1fc416b2f933138394':
vulkan: add a wrapper for hwvulkan_device_t
Change-Id: I807de7c43c147e50caf64b7ed63a31901f1d46e2
Chia-I Wu [Tue, 24 May 2016 01:24:36 +0000 (01:24 +0000)]
vulkan: advertise VK_EXT_debug_report
am:
319382517a
* commit '
319382517afe913285df5bbf76a8a484e6adfbd0':
vulkan: advertise VK_EXT_debug_report
Change-Id: I904abeac1234e146f73b14a817c42adc9b6bc7bb
Chia-I Wu [Tue, 24 May 2016 01:24:36 +0000 (01:24 +0000)]
vulkan: advertise VK_EXT_debug_report
am:
319382517a
* commit '
319382517afe913285df5bbf76a8a484e6adfbd0':
vulkan: advertise VK_EXT_debug_report
Change-Id: Ia72dd77fe660a34ae7a40d1a9c09c3791c5bc3e0
Chia-I Wu [Tue, 24 May 2016 01:24:35 +0000 (01:24 +0000)]
vulkan: add a wrapper for hwvulkan_device_t
am:
31b2e4f01d
* commit '
31b2e4f01d31aae107340cbc4221b8d49fb42767':
vulkan: add a wrapper for hwvulkan_device_t
Change-Id: I4d64d13427218c437babb31d85982c438ed7f2af
Chia-I Wu [Tue, 24 May 2016 01:24:35 +0000 (01:24 +0000)]
vulkan: add a wrapper for hwvulkan_device_t
am:
31b2e4f01d
* commit '
31b2e4f01d31aae107340cbc4221b8d49fb42767':
vulkan: add a wrapper for hwvulkan_device_t
Change-Id: I6968ef5d309c7e98dee46b1d8305dad8e0593597
Chia-I Wu [Tue, 24 May 2016 00:02:37 +0000 (00:02 +0000)]
Merge "Merge "vulkan: do not use exported functions internally" into nyc-dev am:
e6759c3d88 am:
4db4cd57b3" into nyc-mr1-dev-plus-aosp
am:
a7894d7964
* commit '
a7894d7964eb6489b3430cee629d3a4c1abbf4e3':
Change-Id: I977f043e6e75fb62e6513260d75e50c14718399b
Chia-I Wu [Tue, 24 May 2016 00:02:36 +0000 (00:02 +0000)]
Merge "vulkan: do not use exported functions internally" into nyc-dev am:
e6759c3d88 am:
b481e90b79
am:
07c67a876d
* commit '
07c67a876d01cf549b76e283f83c39d2211ccd41':
vulkan: do not use exported functions internally
Change-Id: I7c87eb57a0f7cd12d3d84ec19740be95b41475c8
Android Build Merger (Role) [Mon, 23 May 2016 23:55:31 +0000 (23:55 +0000)]
Merge "Merge "vulkan: do not use exported functions internally" into nyc-dev am:
e6759c3d88 am:
4db4cd57b3" into nyc-mr1-dev-plus-aosp
Chia-I Wu [Mon, 23 May 2016 23:55:25 +0000 (23:55 +0000)]
Merge "vulkan: do not use exported functions internally" into nyc-dev am:
e6759c3d88
am:
4db4cd57b3
* commit '
4db4cd57b374d7cfd0f9904cd0ae92b268e31f6c':
vulkan: do not use exported functions internally
Change-Id: If68a0cf62aaec5b5d1a1ab828c8ad7acefcd83d5
Chia-I Wu [Mon, 23 May 2016 23:55:19 +0000 (23:55 +0000)]
Merge "vulkan: do not use exported functions internally" into nyc-dev am:
e6759c3d88
am:
b481e90b79
* commit '
b481e90b79e9f37b775495d9fb2c4b8fec8e6178':
vulkan: do not use exported functions internally
Change-Id: I956cd4cb44a4cc62cc4efc852bae513a35bc03e3
Chia-I Wu [Mon, 23 May 2016 07:31:02 +0000 (15:31 +0800)]
vulkan: advertise VK_EXT_debug_report
We use VK_EXT_debug_report to report most messages and we should always
advertise the extension. This is complicated however because the HAL may
also advertise the extension.
Do the minimal and cache whether the HAL supports VK_EXT_debug_report in
class Hal. More refactorings will be required if we want to be more
flexible.
Bug:
28753291
Change-Id: I0298b2c3024e2ed059411128dbbe264c0b289a4b
Chia-I Wu [Mon, 23 May 2016 02:47:57 +0000 (10:47 +0800)]
vulkan: add a wrapper for hwvulkan_device_t
Add class Hal as a wrapper for hwvulkan_device_t.
Bug:
28753291
Change-Id: I9612ee5515c7f2266cfc1ef0c8583fa98c82dd86
Chia-I Wu [Mon, 23 May 2016 23:49:46 +0000 (23:49 +0000)]
Merge "vulkan: do not use exported functions internally" into nyc-dev
am:
e6759c3d88
* commit '
e6759c3d886491f01dd2295f71d22609b3b9b259':
vulkan: do not use exported functions internally
Change-Id: I138aa42e7098b69d00517d9bac3d811b9b56e8a7
Chia-I Wu [Mon, 23 May 2016 23:49:46 +0000 (23:49 +0000)]
Merge "vulkan: do not use exported functions internally" into nyc-dev
am:
e6759c3d88
* commit '
e6759c3d886491f01dd2295f71d22609b3b9b259':
vulkan: do not use exported functions internally
Change-Id: I69b3e94ae15ddce28a9e864893ea16caa5b886c5
Chia-I Wu [Mon, 23 May 2016 23:36:52 +0000 (23:36 +0000)]
Merge "vulkan: do not use exported functions internally" into nyc-dev
Felipe Leme [Mon, 23 May 2016 22:21:42 +0000 (22:21 +0000)]
Resolve merge conflicts of
6108f5d to nyc-mr1-dev am:
3518381415
am:
2057cc86a7
* commit '
2057cc86a79d5241bdf41b1dd7f6cd658b7b16f8':
Change-Id: I936112724e991490e4e8957ea08dd4408525e917
Felipe Leme [Mon, 23 May 2016 22:21:41 +0000 (22:21 +0000)]
Resolve merge conflicts of
2387813 to nyc-mr1-dev-plus-aosp
am:
a7f6a4534c
* commit '
a7f6a4534c076ef4f84b7f08cbd507e50d71c04b':
Expose functions used to add entries to the zip file.
Change-Id: I9680c1b12afa378941d776e434789d536e04e4b0
Felipe Leme [Mon, 23 May 2016 21:28:33 +0000 (21:28 +0000)]
Resolve merge conflicts of
6108f5d to nyc-mr1-dev
am:
3518381415
* commit '
3518381415d1c1fc580adbe1b398850dcd07ba2b':
Change-Id: I82bdb294edaced03d2a2117016668c4f65b00123
Felipe Leme [Mon, 23 May 2016 21:18:16 +0000 (14:18 -0700)]
Resolve merge conflicts of
2387813 to nyc-mr1-dev-plus-aosp
BUG:
28867848
Change-Id: I6893cab64078617c34a4256b394a3686287f6278
Felipe Leme [Mon, 23 May 2016 21:07:04 +0000 (14:07 -0700)]
Resolve merge conflicts of
6108f5d to nyc-mr1-dev
BUG:
28867848
Change-Id: I99392f1706af5fb9268ad1b32aa7f4b10e397d84
Adam Buchbinder [Mon, 23 May 2016 20:18:52 +0000 (13:18 -0700)]
Add missing va_end() calls in some variadic functions.
This addresses the following cppcheck reports:
[dumpstate/utils.cpp:666]: (error)
va_list 'ap' was opened but not closed by va_end().
[dumpstate/utils.cpp:703]: (error)
va_list 'ap' was opened but not closed by va_end().
Change-Id: I2405f063a6da1a109192484577bc18f5f40f2b99
Felipe Leme [Mon, 23 May 2016 20:12:48 +0000 (20:12 +0000)]
Merge "Expose functions used to add entries to the zip file." into nyc-dev
am:
6108f5d400
* commit '
6108f5d4004d2a3397c22d22025b8e0eb79b8467':
Expose functions used to add entries to the zip file.
Change-Id: I6c1ce87ce8eb9edf32df7c3f0e1926acd1bc0e00
TreeHugger Robot [Mon, 23 May 2016 20:01:25 +0000 (20:01 +0000)]
Merge "Expose functions used to add entries to the zip file." into nyc-dev
Felipe Leme [Thu, 19 May 2016 23:18:17 +0000 (16:18 -0700)]
Expose functions used to add entries to the zip file.
Currently only dumpstate.cpp is using the new functions and variables
used to add an entry to the zip file so they're defined locally, but
they should be exposed through the .h so they can be used by the
device-specific dumpstate_board() implementations.
This CL moves the following definitions to the .h:
- bugreport_dir
- ZIP_ROOT_DIR
- add_zip_entry()
- add_zip_entry_from_fd()
It also refactored functions that were taking a specific file location
to use bugreport_dir instead, to avoid pollution on main().
BUG:
28867848
Change-Id: Ic5faa203b0863bc950d640f22fb91977e52b6bfc
Lajos Molnar [Mon, 23 May 2016 16:33:23 +0000 (16:33 +0000)]
Merge "omx: add asString for new enumerations and fix some issues am:
1b9c8069f4 am:
782ac39b9b" into nyc-mr1-dev-plus-aosp
am:
ad75bfca00
* commit '
ad75bfca008317b0f2024e916f04ab8c4ebbe6c2':
Change-Id: I927613feb2f2c761b324752d3330aa179de72a8d
Lajos Molnar [Mon, 23 May 2016 16:33:23 +0000 (16:33 +0000)]
omx: add asString for new enumerations and fix some issues am:
1b9c8069f4 am:
730cd51231
am:
c84d0b1d5b
* commit '
c84d0b1d5b8bf265b3de3278e56be0ce9d62e9ae':
omx: add asString for new enumerations and fix some issues
Change-Id: Ie7da01b8bad7ff6aa42b3873a67c97b8beaac804
Android Build Merger (Role) [Mon, 23 May 2016 16:30:24 +0000 (16:30 +0000)]
Merge "omx: add asString for new enumerations and fix some issues am:
1b9c8069f4 am:
782ac39b9b" into nyc-mr1-dev-plus-aosp
Lajos Molnar [Mon, 23 May 2016 16:30:10 +0000 (16:30 +0000)]
omx: add asString for new enumerations and fix some issues am:
1b9c8069f4
am:
782ac39b9b
* commit '
782ac39b9bb0d6e801316c75db5e700eef808f48':
omx: add asString for new enumerations and fix some issues
Change-Id: Ic734366ec2f995ebb262a36cb0ca7556754b6aee
Lajos Molnar [Mon, 23 May 2016 16:30:09 +0000 (16:30 +0000)]
omx: add asString for new enumerations and fix some issues am:
1b9c8069f4
am:
730cd51231
* commit '
730cd5123131877be45ef4182e8f80b310e29630':
omx: add asString for new enumerations and fix some issues
Change-Id: Ic3a7e6a128e184fd9e66891eb5b963eee27ea369
Lajos Molnar [Mon, 23 May 2016 16:27:12 +0000 (16:27 +0000)]
omx: add asString for new enumerations and fix some issues
am:
1b9c8069f4
* commit '
1b9c8069f423f25c4dc166618d9fbe8d94d7f7c0':
omx: add asString for new enumerations and fix some issues
Change-Id: I774af98ced6dd8bf7aac8873e3d93655fd5c6f2a
Lajos Molnar [Mon, 23 May 2016 16:27:12 +0000 (16:27 +0000)]
omx: add asString for new enumerations and fix some issues
am:
1b9c8069f4
* commit '
1b9c8069f423f25c4dc166618d9fbe8d94d7f7c0':
omx: add asString for new enumerations and fix some issues
Change-Id: I26e6e98d64843f15cb551011b502da0b0559c30a
Lajos Molnar [Sat, 21 May 2016 02:38:40 +0000 (19:38 -0700)]
omx: add asString for new enumerations and fix some issues
Bug:
28671284
Change-Id: I54e98d727f974544d51b2a14b565ad24912ab242
Lajos Molnar [Mon, 23 May 2016 13:27:41 +0000 (13:27 +0000)]
Merge "Merge "omx: add missing MPEG4 levels" into nyc-dev am:
6472c8c660 am:
36deda01ea" into nyc-mr1-dev-plus-aosp
am:
78c8e91ede
* commit '
78c8e91ede97f59ad1b8ce86fc77f48706f6331e':
Change-Id: Ib41e9a1ec6b497150cb2935efc4720e90af5723b
Lajos Molnar [Mon, 23 May 2016 13:27:40 +0000 (13:27 +0000)]
Merge "omx: add missing MPEG4 levels" into nyc-dev am:
6472c8c660 am:
8bd815b96d
am:
df16d3775b
* commit '
df16d3775b7139a10ca7e5bc2e1d721cc03887ec':
omx: add missing MPEG4 levels
Change-Id: I943b7508a7af9222bc5326d77ba27f2c4e58bb43
Android Build Merger (Role) [Mon, 23 May 2016 13:24:59 +0000 (13:24 +0000)]
Merge "Merge "omx: add missing MPEG4 levels" into nyc-dev am:
6472c8c660 am:
36deda01ea" into nyc-mr1-dev-plus-aosp
Lajos Molnar [Mon, 23 May 2016 13:24:49 +0000 (13:24 +0000)]
Merge "omx: add missing MPEG4 levels" into nyc-dev am:
6472c8c660
am:
36deda01ea
* commit '
36deda01eaf109a4cfa7f64eecd6f560da6b7b48':
omx: add missing MPEG4 levels
Change-Id: I083615dcd7cbb102f14469f3c793bea8381e5588
Lajos Molnar [Mon, 23 May 2016 13:24:46 +0000 (13:24 +0000)]
Merge "omx: add missing MPEG4 levels" into nyc-dev am:
6472c8c660
am:
8bd815b96d
* commit '
8bd815b96d95cb7a4396808630853faed934f157':
omx: add missing MPEG4 levels
Change-Id: I33d5ad62fba678924a61d37d8cbfc27a9d40ccaa
Lajos Molnar [Mon, 23 May 2016 13:21:51 +0000 (13:21 +0000)]
Merge "omx: add missing MPEG4 levels" into nyc-dev
am:
6472c8c660
* commit '
6472c8c660232300a0d2bf8721ec028a2db229a9':
omx: add missing MPEG4 levels
Change-Id: If2a70773c6fcc4975de4a6fbc161e544f5d40715
Lajos Molnar [Mon, 23 May 2016 13:21:51 +0000 (13:21 +0000)]
Merge "omx: add missing MPEG4 levels" into nyc-dev
am:
6472c8c660
* commit '
6472c8c660232300a0d2bf8721ec028a2db229a9':
omx: add missing MPEG4 levels
Change-Id: Ia51fbea677782007099d0984e23ced3ed8844cf2
Lajos Molnar [Mon, 23 May 2016 13:17:25 +0000 (13:17 +0000)]
Merge "omx: add missing MPEG4 levels" into nyc-dev
Chia-I Wu [Fri, 20 May 2016 08:15:06 +0000 (16:15 +0800)]
vulkan: do not use exported functions internally
Our vkGet*ProcAddr uses the exported functions. They will break when any
of the exported functions are overridden (e.g., through LD_PRELOAD).
Unexport and move all exported functions to vulkan::api namespace.
Re-export them by having vkFoo as a wrapper to vulkan::api::Foo.
Another option is to re-export vulkan::api::Foo by having vkFoo as an
alias using __attribute__((alias)). That results in smaller binaries.
But we will not be able to catch mismatches between vulkan.h and
vulkan.api.
To avoid future breakage, define VK_NO_PROTOTYPES for all files except
api_gen.cpp.
Bug:
28886971
Change-Id: I08fde7ebb247f8c7e040ccf812b40b02094d3c7f
Jesse Hall [Sat, 21 May 2016 21:33:43 +0000 (21:33 +0000)]
Merge "Merge "Ensure memory ordering around libagl and EGL refcount operations" into nyc-dev am:
bac438bbb6 am:
dca51004bb" into nyc-mr1-dev-plus-aosp
am:
34f1b0c6b4
* commit '
34f1b0c6b46a5fcfd9bd94d19a06453181b1830f':
Change-Id: I512f629f6ea64922530c0b2a5c511dc62ada19f1
Jesse Hall [Sat, 21 May 2016 21:33:42 +0000 (21:33 +0000)]
Merge "Ensure memory ordering around libagl and EGL refcount operations" into nyc-dev am:
bac438bbb6 am:
069b893273
am:
bb707e74c1
* commit '
bb707e74c1350a6e6515d16fac5f9fee041fab55':
Ensure memory ordering around libagl and EGL refcount operations
Change-Id: Id725db1be0e5b070762278b3ebd57ba72fe6c613
Android Build Merger (Role) [Sat, 21 May 2016 21:30:42 +0000 (21:30 +0000)]
Merge "Merge "Ensure memory ordering around libagl and EGL refcount operations" into nyc-dev am:
bac438bbb6 am:
dca51004bb" into nyc-mr1-dev-plus-aosp
Jesse Hall [Sat, 21 May 2016 21:30:32 +0000 (21:30 +0000)]
Merge "Ensure memory ordering around libagl and EGL refcount operations" into nyc-dev am:
bac438bbb6
am:
dca51004bb
* commit '
dca51004bb31897b4bcad516ecb5562695a52d64':
Ensure memory ordering around libagl and EGL refcount operations
Change-Id: I63419acb73258df52099ba4bc6b9f760bec8c267
Jesse Hall [Sat, 21 May 2016 21:30:30 +0000 (21:30 +0000)]
Merge "Ensure memory ordering around libagl and EGL refcount operations" into nyc-dev am:
bac438bbb6
am:
069b893273
* commit '
069b893273524911a23f2b4ae8bd3508551abe5c':
Ensure memory ordering around libagl and EGL refcount operations
Change-Id: I031625a0ae0ea39840ca78c74a2e1619cf3958dc
Jesse Hall [Sat, 21 May 2016 21:27:47 +0000 (21:27 +0000)]
Merge "Ensure memory ordering around libagl and EGL refcount operations" into nyc-dev
am:
bac438bbb6
* commit '
bac438bbb682b09b618f47f2e36628a464afc8ea':
Ensure memory ordering around libagl and EGL refcount operations
Change-Id: Ie2643fd243a9aa66080457d318a35550c502fd67
Jesse Hall [Sat, 21 May 2016 21:27:47 +0000 (21:27 +0000)]
Merge "Ensure memory ordering around libagl and EGL refcount operations" into nyc-dev
am:
bac438bbb6
* commit '
bac438bbb682b09b618f47f2e36628a464afc8ea':
Ensure memory ordering around libagl and EGL refcount operations
Change-Id: Ia12a377e298f015d5c2dfe71fb5cf1e88933f17c
Jesse Hall [Sat, 21 May 2016 21:21:42 +0000 (21:21 +0000)]
Merge "Ensure memory ordering around libagl and EGL refcount operations" into nyc-dev
OSDN Git Service
