Tapani Plli [Wed, 30 Aug 2017 18:05:31 +0000 (18:05 +0000)]
Require EGL_KHR_gl_colorspace for wide_color tests. am:
2a3edba962 am:
3dc144a93d
am:
d720c172e0
Change-Id: I1b85e932324d298398196e72faeb1975319287b9
Tapani Plli [Wed, 30 Aug 2017 17:58:00 +0000 (17:58 +0000)]
Require EGL_KHR_gl_colorspace for wide_color tests. am:
2a3edba962
am:
3dc144a93d
Change-Id: I7ae4e8ef94f7231cdec7e7ef4cc9e3d5b7613df4
Tapani Plli [Wed, 30 Aug 2017 17:51:01 +0000 (17:51 +0000)]
Require EGL_KHR_gl_colorspace for wide_color tests.
am:
2a3edba962
Change-Id: Ib187061a097641d56876d85b1af68baae7bc6f1d
Tapani Pälli [Mon, 28 Aug 2017 06:20:53 +0000 (09:20 +0300)]
Require EGL_KHR_gl_colorspace for wide_color tests.
These tests utilize enum EGL_GL_COLORSPACE_KHR which is introduced by
EGL_KHR_gl_colorspace extension, check first for support and skip the
test if extension is not supported.
v2: loosen the check, only check when enum in use (Courtney)
Change-Id: I891a6fdcce49ac6dcd42577076d4cf64a143dd38
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Mika Isojarvi [Mon, 28 Aug 2017 21:35:22 +0000 (21:35 +0000)]
Merge "Merge Vulkan CTS 1.0.2.5 into goog/oc-mr1-dev" into oc-mr1-dev
am:
758c7ce466
Change-Id: I30cdabd60ac0370193b932b7492dd92ac52e282e
Mika Isojarvi [Mon, 28 Aug 2017 21:21:05 +0000 (21:21 +0000)]
Merge "Merge Vulkan CTS 1.0.2.5 into goog/oc-mr1-dev" into oc-mr1-dev
Courtney Goeltzenleuchter [Mon, 28 Aug 2017 16:45:24 +0000 (16:45 +0000)]
Check only what's needed and use threshold
am:
a3e669768d
Change-Id: I2bb47f03201e9ff169f328541efdf147aecbb812
Courtney Goeltzenleuchter [Fri, 28 Jul 2017 19:51:31 +0000 (13:51 -0600)]
Check only what's needed and use threshold
Check for only the functionality needed for a specific test.
E.g. if testing floating point color, don't need to check
for support of 10:10:10:2 pixel format.
Some devices are not able to hit the exact values calculated.
Not unexpected, update tests to use thresholds.
Note: waiting on results of b/
64487716. Seeing failure on
Pixel devices. Need to make sure it's not a test issue.
Test: adb -s
0424415804161004f80d -d shell am start \
-n com.drawelements.deqp/android.app.NativeActivity \
-e cmdLine '"deqp --deqp-case=dEQP-EGL.functional.wide_color.* \
--deqp-log-filename=/sdcard/dEQP-Log.qpa"'
Bug:
64487716
Change-Id: I2adb31eaa3b189179aeceb9e8f6b1ac8587b6027
(cherry picked from commit
041a1b5e82db7a6945aaefd791639de1c8c9e84d)
Mika Isojärvi [Fri, 25 Aug 2017 17:57:17 +0000 (10:57 -0700)]
Merge Vulkan CTS 1.0.2.5 into goog/oc-mr1-dev
Bug:
64932237
Test: Run Deqp CTS Vulkan tests on some Google devices
Change-Id: I990a6e258c4cc0d5c40686eef57aee421a132f6c
Courtney Goeltzenleuchter [Thu, 24 Aug 2017 23:36:11 +0000 (23:36 +0000)]
Merge "Check only what's needed and use threshold" am:
923d047106 am:
7fd5af1735
am:
463c3ea016
Change-Id: I6d981412abde9c65e1e323b48536b07ec65f2939
Courtney Goeltzenleuchter [Thu, 24 Aug 2017 23:19:28 +0000 (23:19 +0000)]
Merge "Check only what's needed and use threshold" am:
923d047106
am:
7fd5af1735
Change-Id: I2663d7c9638d0040dd8a500ae0aa8090844e578b
Courtney Goeltzenleuchter [Thu, 24 Aug 2017 23:11:50 +0000 (23:11 +0000)]
Merge "Check only what's needed and use threshold"
am:
923d047106
Change-Id: I375f81f9ea270da5ca86bbb9c0a0465a82dbec19
Treehugger Robot [Thu, 24 Aug 2017 22:57:17 +0000 (22:57 +0000)]
Merge "Check only what's needed and use threshold"
Mika Isojärvi [Thu, 24 Aug 2017 22:46:27 +0000 (22:46 +0000)]
Merge Vulkan CTS 1.0.2.5 into aosp/master am:
76a147bf66 am:
9f330c685b
am:
9f305bdded
Change-Id: I388c5e497cef6c20e57704e313a115ca2b78383b
Mika Isojärvi [Thu, 24 Aug 2017 22:40:34 +0000 (22:40 +0000)]
Merge Vulkan CTS 1.0.2.5 into aosp/master am:
76a147bf66
am:
9f330c685b
Change-Id: I5cca00d1f902a169550e2077e17c2fd52cb7ac9b
Mika Isojärvi [Thu, 24 Aug 2017 22:35:31 +0000 (22:35 +0000)]
Merge Vulkan CTS 1.0.2.5 into aosp/master
am:
76a147bf66
Change-Id: I05b18f9180285aa9b140b63f132020874d83e9d4
Mika Isojärvi [Thu, 24 Aug 2017 20:13:19 +0000 (13:13 -0700)]
Merge Vulkan CTS 1.0.2.5 into aosp/master
Bug:
64932237
Change-Id: Ic2758a85f3a8f8cf00985b03a89830ba509f824d
Courtney Goeltzenleuchter [Fri, 28 Jul 2017 19:51:31 +0000 (13:51 -0600)]
Check only what's needed and use threshold
Check for only the functionality needed for a specific test.
E.g. if testing floating point color, don't need to check
for support of 10:10:10:2 pixel format.
Some devices are not able to hit the exact values calculated.
Not unexpected, update tests to use thresholds.
Note: waiting on results of b/
64487716. Seeing failure on
Pixel devices. Need to make sure it's not a test issue.
Test: adb -s
0424415804161004f80d -d shell am start \
-n com.drawelements.deqp/android.app.NativeActivity \
-e cmdLine '"deqp --deqp-case=dEQP-EGL.functional.wide_color.* \
--deqp-log-filename=/sdcard/dEQP-Log.qpa"'
Change-Id: I2adb31eaa3b189179aeceb9e8f6b1ac8587b6027
(cherry picked from commit
041a1b5e82db7a6945aaefd791639de1c8c9e84d)
Michael Chock [Tue, 22 Aug 2017 18:46:57 +0000 (18:46 +0000)]
Merge "Avoid thread state races in EGL multithread tests" am:
5a0d512e5b am:
0efcf60ff5 am:
d3f6571fff
am:
09d1d49b64
Change-Id: I27bed7cc5a3ca1daebc6ae10d9a936ff55da3427
Alexander Galazin [Tue, 22 Aug 2017 18:46:37 +0000 (18:46 +0000)]
Merge "Run Draw*BaseVertex if EXT_draw_elements_base_vertex is present" am:
4929480c47 am:
df3f2b14f6 am:
a7b9f7a5d9
am:
3664e44402
Change-Id: I06969414b3a1d4d1a396e5432bac58fd3fefffe0
Michael Chock [Tue, 22 Aug 2017 18:43:02 +0000 (18:43 +0000)]
Merge "Avoid thread state races in EGL multithread tests" am:
5a0d512e5b am:
0efcf60ff5
am:
d3f6571fff
Change-Id: I66748716e20fea93d29cbb114ed7301908657f16
Alexander Galazin [Tue, 22 Aug 2017 18:42:43 +0000 (18:42 +0000)]
Merge "Run Draw*BaseVertex if EXT_draw_elements_base_vertex is present" am:
4929480c47 am:
df3f2b14f6
am:
a7b9f7a5d9
Change-Id: I2b6fcc4798f08029ae47f83ca699aa9e6c1dc4d3
Michael Chock [Tue, 22 Aug 2017 18:39:28 +0000 (18:39 +0000)]
Merge "Avoid thread state races in EGL multithread tests" am:
5a0d512e5b
am:
0efcf60ff5
Change-Id: Ide30bf228e53857ea93ce7a91e4c2b10d8a845a0
Alexander Galazin [Tue, 22 Aug 2017 18:39:11 +0000 (18:39 +0000)]
Merge "Run Draw*BaseVertex if EXT_draw_elements_base_vertex is present" am:
4929480c47
am:
df3f2b14f6
Change-Id: I330781b5ea59882db46629591b30f49ae6486a6a
Michael Chock [Tue, 22 Aug 2017 18:32:44 +0000 (18:32 +0000)]
Merge "Avoid thread state races in EGL multithread tests"
am:
5a0d512e5b
Change-Id: I775814f0bfe3cad21a3cada9c017d08e5a2aa739
Alexander Galazin [Tue, 22 Aug 2017 18:32:21 +0000 (18:32 +0000)]
Merge "Run Draw*BaseVertex if EXT_draw_elements_base_vertex is present"
am:
4929480c47
Change-Id: Ie0e580b58bace63bb7dafc4fafdbe17f766ae3a3
Treehugger Robot [Tue, 22 Aug 2017 18:13:36 +0000 (18:13 +0000)]
Merge "Avoid thread state races in EGL multithread tests"
Treehugger Robot [Tue, 22 Aug 2017 18:10:07 +0000 (18:10 +0000)]
Merge "Run Draw*BaseVertex if EXT_draw_elements_base_vertex is present"
Alexander Galazin [Wed, 16 Aug 2017 09:36:01 +0000 (11:36 +0200)]
Run Draw*BaseVertex if EXT_draw_elements_base_vertex is present
Draw*BaseVertex methods are enabled if
the EXT_draw_elements_base_vertex extension is present
Follow-up on
1b1ea05b
Components: AOSP
Affects: dEQP-GLES31.functional.draw_base_vertex.*
Change-Id: If8a4860a956c771ec5ea3341e2227f437b12a286
Mika Isojrvi [Thu, 17 Aug 2017 00:39:57 +0000 (00:39 +0000)]
Fix texture mip level size in framebuffer fetch tests am:
be0d165a5d am:
0f01836518 am:
cc06f40d06
am:
b59646223a
Change-Id: Ia2981aee3c7c1240f1404ca4cf98a4e9d728da2d
Mika Isojrvi [Thu, 17 Aug 2017 00:28:39 +0000 (00:28 +0000)]
Fix texture mip level size in framebuffer fetch tests am:
be0d165a5d am:
0f01836518
am:
cc06f40d06
Change-Id: Ia5336f05e320268f49b41a10f419c01b690e291f
Mika Isojrvi [Thu, 17 Aug 2017 00:17:54 +0000 (00:17 +0000)]
Fix texture mip level size in framebuffer fetch tests am:
be0d165a5d
am:
0f01836518
Change-Id: I39f281404c2497d957ae91d93d368202f83febfb
Mika Isojrvi [Thu, 17 Aug 2017 00:08:48 +0000 (00:08 +0000)]
Fix texture mip level size in framebuffer fetch tests
am:
be0d165a5d
Change-Id: I7fb9c075ee79e411ea295999e9edd7f38a5e5bc9
Mika Isojärvi [Wed, 16 Aug 2017 20:40:22 +0000 (13:40 -0700)]
Fix texture mip level size in framebuffer fetch tests
Bug:
64280744
Test: Ran tests with multiple Google devices
Change-Id: I369a3c9b16270655332d5a608207f0da2633e0fe
james.glanville [Wed, 16 Aug 2017 19:15:41 +0000 (19:15 +0000)]
Merge "Use safe glFramebufferTexture* function" am:
ec5ccbe144 am:
d4c3e6e71b am:
1f2e434e86
am:
978b206a7a
Change-Id: I8f7439231e43ef002bd2759fef887e17e154bca2
Michael Chock [Wed, 16 Aug 2017 19:15:23 +0000 (19:15 +0000)]
Merge "Do not use degenerate frames in EGL tests" am:
f5971fe17f am:
4a2d8af710 am:
bdab538931
am:
ad656a0faa
Change-Id: Ia1dcb275ef44e6eae61033b59d50286d99d5b8bb
james.glanville [Wed, 16 Aug 2017 19:12:11 +0000 (19:12 +0000)]
Merge "Use safe glFramebufferTexture* function" am:
ec5ccbe144 am:
d4c3e6e71b
am:
1f2e434e86
Change-Id: I05b273c4c5842ef9713cea1e0ee5db14965bc6df
Michael Chock [Wed, 16 Aug 2017 19:11:52 +0000 (19:11 +0000)]
Merge "Do not use degenerate frames in EGL tests" am:
f5971fe17f am:
4a2d8af710
am:
bdab538931
Change-Id: I659eb59a332af92c90de471a3cdb6eb2ce9ec4d2
james.glanville [Wed, 16 Aug 2017 19:08:36 +0000 (19:08 +0000)]
Merge "Use safe glFramebufferTexture* function" am:
ec5ccbe144
am:
d4c3e6e71b
Change-Id: I31749dfd7ca7258c702b3d00c3f438cebbbf4056
Michael Chock [Wed, 16 Aug 2017 19:08:22 +0000 (19:08 +0000)]
Merge "Do not use degenerate frames in EGL tests" am:
f5971fe17f
am:
4a2d8af710
Change-Id: I86d818ee189deef3102b0f112378cef1723edad0
james.glanville [Wed, 16 Aug 2017 19:04:43 +0000 (19:04 +0000)]
Merge "Use safe glFramebufferTexture* function"
am:
ec5ccbe144
Change-Id: I156ecc2a6ed17e3e23ef17ebbe026be27c1670c3
Michael Chock [Wed, 16 Aug 2017 19:04:22 +0000 (19:04 +0000)]
Merge "Do not use degenerate frames in EGL tests"
am:
f5971fe17f
Change-Id: I9807e27047a0d0280e06bc826cab3e6cb88b5ab6
Treehugger Robot [Wed, 16 Aug 2017 18:59:45 +0000 (18:59 +0000)]
Merge "Use safe glFramebufferTexture* function"
Treehugger Robot [Wed, 16 Aug 2017 18:59:42 +0000 (18:59 +0000)]
Merge "Do not use degenerate frames in EGL tests"
Alexander Galazin [Wed, 16 Aug 2017 18:57:22 +0000 (18:57 +0000)]
Merge "Report tests using Draw*BaseVertex as NotSupported" am:
f96636fdfa am:
eaf6e29e46 am:
3946a20ebc
am:
cfe4446a05
Change-Id: I9bd37b581e0cff226dc0afe4771ff51ceb2b93e2
Alexander Galazin [Wed, 16 Aug 2017 18:54:52 +0000 (18:54 +0000)]
Merge "Report tests using Draw*BaseVertex as NotSupported" am:
f96636fdfa am:
eaf6e29e46
am:
3946a20ebc
Change-Id: Ifc2e7f4ef52d03eb2f6570f5fc83818ee4e2c190
Alexander Galazin [Wed, 16 Aug 2017 18:51:50 +0000 (18:51 +0000)]
Merge "Report tests using Draw*BaseVertex as NotSupported" am:
f96636fdfa
am:
eaf6e29e46
Change-Id: If70e55237194763a02f31d3a20bbc475403d8670
Alexander Galazin [Wed, 16 Aug 2017 18:47:50 +0000 (18:47 +0000)]
Merge "Report tests using Draw*BaseVertex as NotSupported"
am:
f96636fdfa
Change-Id: Iccb20250f9b98f983fc831911a1f9b4d4a98fbfb
Treehugger Robot [Wed, 16 Aug 2017 18:36:54 +0000 (18:36 +0000)]
Merge "Report tests using Draw*BaseVertex as NotSupported"
Alexander Galazin [Wed, 16 Aug 2017 18:30:19 +0000 (18:30 +0000)]
Merge "Fix error double accounting in fuzzyCompare()" am:
0cf17c4bf8 am:
f64327185c am:
aca02e1db5
am:
c740af0a26
Change-Id: I07e51f9da09da70bbc90bc0f0ba62ee53dbacb8e
Alexander Galazin [Wed, 16 Aug 2017 18:27:18 +0000 (18:27 +0000)]
Merge "Fix error double accounting in fuzzyCompare()" am:
0cf17c4bf8 am:
f64327185c
am:
aca02e1db5
Change-Id: I33c50071a663091adfc992b518610b68ed46b303
Alexander Galazin [Wed, 16 Aug 2017 18:23:48 +0000 (18:23 +0000)]
Merge "Fix error double accounting in fuzzyCompare()" am:
0cf17c4bf8
am:
f64327185c
Change-Id: I5a42417bee0eab58fc2cae3a653e41e4624cb2eb
Alexander Galazin [Wed, 16 Aug 2017 18:20:18 +0000 (18:20 +0000)]
Merge "Fix error double accounting in fuzzyCompare()"
am:
0cf17c4bf8
Change-Id: Ife3e4f1bd13c6f4cb939950635880ce32d2b1df3
Treehugger Robot [Wed, 16 Aug 2017 18:06:52 +0000 (18:06 +0000)]
Merge "Fix error double accounting in fuzzyCompare()"
Michael Chock [Mon, 14 Aug 2017 15:36:11 +0000 (08:36 -0700)]
Avoid thread state races in EGL multithread tests
Previously, threads objects inside dEQP-EGL.functional.multithread.*
tests would conflate thread execution status with test results. The
former would only be set inside the thread, but the latter could be set
by other threads (e.g., a test thread might set its status to RUNNING
while another test might attempt to set the status of NOT_SUPPORTED).
These race conditions could lead to incorrect results.
Fix this by moving error and not-supported states out of the thread
execution state, and instead storing them as single-purpose flags inside
the test case object, avoiding the possibility of conflicting writes.
Change-Id: I2b117aa98c1c2b69b0d134610d6fd37656083e54
Michael Chock [Mon, 14 Aug 2017 18:55:14 +0000 (11:55 -0700)]
Do not use degenerate frames in EGL tests
The dEQP-EGL.functional.buffer_age.* and
dEQP-EGL.functional.partial_update.* tests use randomly-generated frames
for rendering. The test allows the generation of frames with a width or
height of 0, but the tcu::PixelBufferAccess interface does not permit
0-sized subregions (see assertions inside getSubregion overloads in
tcuTextureUtil.cpp).
Skip the rendering of degenerate frames in the reference renderer, as
they are unsupported but would not affect the rendering if they were.
Change-Id: I3977c3c293715db633dde74132e56b5d9303ab28
james.glanville [Wed, 16 Aug 2017 10:50:19 +0000 (11:50 +0100)]
Use safe glFramebufferTexture* function
glFramebufferTexture() is only supported when GL_EXT_geometry_shader is
present. Use glFramebufferTextureLayer() instead so that testing is
possible on unextended ES3.1 contexts.
Components: AOSP
Affects:
dEQP-GLES31.functional.shaders.framebuffer_fetch.basic.framebuffer_texture_level
Alexander Galazin [Wed, 16 Aug 2017 09:36:01 +0000 (11:36 +0200)]
Report tests using Draw*BaseVertex as NotSupported
Draw*BaseVertex methods were added in GLES 3.2.
Report tests using these methods as NotSupported if
GLES 3.1 context is returned.
Components: AOSP
Affects: dEQP-GLES31.functional.draw_base_vertex.*
Change-Id: I87c918d5f66a0a5b547f8e625c662203a7f85048
Alexander Galazin [Wed, 16 Aug 2017 01:07:24 +0000 (01:07 +0000)]
Check for tessellation/geometry extensions being exposed am:
573154bb7b am:
f79e5f07b3 am:
b50ad0b932
am:
4d8117a4c2
Change-Id: I835660dbb6f60be47d6f8e80aea2cb88558f4f90
Alexander Galazin [Wed, 16 Aug 2017 00:51:38 +0000 (00:51 +0000)]
Check for tessellation/geometry extensions being exposed am:
573154bb7b am:
f79e5f07b3
am:
b50ad0b932
Change-Id: I766cb8e77a92f4dbe295224522a40bc568aa8bab
Alexander Galazin [Wed, 16 Aug 2017 00:41:06 +0000 (00:41 +0000)]
Check for tessellation/geometry extensions being exposed am:
573154bb7b
am:
f79e5f07b3
Change-Id: I3a2713fb0e10929d2b326443ab82beeed61df85e
Alexander Galazin [Wed, 16 Aug 2017 00:32:11 +0000 (00:32 +0000)]
Check for tessellation/geometry extensions being exposed
am:
573154bb7b
Change-Id: I86d05362cf94c693d4000969d2c177c692f07686
Alexander Galazin [Fri, 11 Aug 2017 09:03:50 +0000 (11:03 +0200)]
Check for tessellation/geometry extensions being exposed
Some sample_variables tests use tessellation/geometry shaders.
Need to check that the relevant extensions are exposed.
Components: AOSP
Affects:
dEQP-GLES31.functional.debug.negative_coverage.*.oes_sample_variables.access_built_in_types_inside_other_shaders
Change-Id: Iff74939d474082938955e5b7ebfc41ea3b4a6ec5
Chih-Hung Hsieh [Thu, 10 Aug 2017 16:41:38 +0000 (16:41 +0000)]
Suppress non-critical warnings in external/deqp. am:
b7ae0d8484 am:
ed7ff5357c am:
5ecdd6b007
am:
4ac728eec7
Change-Id: I2efed221e92c5627b1483fa7252a1a7e2896696d
Chih-Hung Hsieh [Thu, 10 Aug 2017 16:37:45 +0000 (16:37 +0000)]
Suppress non-critical warnings in external/deqp. am:
b7ae0d8484 am:
ed7ff5357c
am:
5ecdd6b007
Change-Id: I893b3a0a2cf4d18517af8504d144c34431e5b7df
Chih-Hung Hsieh [Thu, 10 Aug 2017 16:33:41 +0000 (16:33 +0000)]
Suppress non-critical warnings in external/deqp. am:
b7ae0d8484
am:
ed7ff5357c
Change-Id: Ifeae1faec963fb0096c6df33942a394b50b8a36b
Chih-Hung Hsieh [Thu, 10 Aug 2017 16:22:23 +0000 (16:22 +0000)]
Suppress non-critical warnings in external/deqp.
am:
b7ae0d8484
Change-Id: I203833d39406f0530796d10e6d7a4d8f9beb2dbb
Alexander Galazin [Tue, 8 Aug 2017 11:15:40 +0000 (13:15 +0200)]
Fix error double accounting in fuzzyCompare()
fuzzyCompare() has a loop to go through all the pixels and generate error sum.
It skips some pixels using random number generator between 0-8.
Random number generator sometime generate 0 and it ends up
calculating error sum twice for the same pixel.
If this pixel has error, then this add up error sum twice.
Components: Framework
Change-Id: I08e06e29faedb99cfd8fa479e97a437c06008848
Chih-Hung Hsieh [Wed, 9 Aug 2017 23:23:07 +0000 (16:23 -0700)]
Suppress non-critical warnings in external/deqp.
* We should enable those warnings after fixing the upstream source code.
Bug:
64487164
Test: build with WITH_TIDY=1
Change-Id: Ie4961d23b8f57e8d3a3ada0e64df82ed18dd366f
Mika Isojarvi [Fri, 4 Aug 2017 23:31:20 +0000 (23:31 +0000)]
Merge "Release EGL resources in CTS worker threads" am:
fde96926aa am:
cf24be7e7a am:
2525ece0ec
am:
50a81a8000
Change-Id: I3a87d35ce7605c7c86d1df2df0ed6e3db6de2a9f
Mika Isojarvi [Fri, 4 Aug 2017 23:21:40 +0000 (23:21 +0000)]
Merge "Release EGL resources in CTS worker threads" am:
fde96926aa am:
cf24be7e7a
am:
2525ece0ec
Change-Id: Id581ba0e96248ddf1bbeef9ce00dd30065d86d3f
Mika Isojarvi [Fri, 4 Aug 2017 23:15:40 +0000 (23:15 +0000)]
Merge "Release EGL resources in CTS worker threads" am:
fde96926aa
am:
cf24be7e7a
Change-Id: I2381217adc2dd6fca34e8ef19ebfe90b5310638e
Mika Isojarvi [Fri, 4 Aug 2017 23:10:09 +0000 (23:10 +0000)]
Merge "Release EGL resources in CTS worker threads"
am:
fde96926aa
Change-Id: I8502a522e44c310dfb96710c7b301ebe798668ec
Mika Isojarvi [Fri, 4 Aug 2017 22:55:11 +0000 (22:55 +0000)]
Merge "Release EGL resources in CTS worker threads"
Android Build Merger (Role) [Fri, 4 Aug 2017 22:53:17 +0000 (22:53 +0000)]
Merge "Merge "Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
b8e4ff4043 am:
a2d901c3d8 am:
2431a0b0d9 am:
5fe6ec300f am:
781a2ef1e0 am:
b85caaf64f am:
456d849dfb" into oc-dr1-dev-plus-aosp am:
a39117417f" into oc-mr1-dev-plus-aosp
Graeme Leese [Fri, 4 Aug 2017 22:52:47 +0000 (22:52 +0000)]
Merge "Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
b8e4ff4043 am:
a2d901c3d8 am:
2431a0b0d9 am:
5fe6ec300f am:
781a2ef1e0 am:
b85caaf64f am:
456d849dfb" into oc-dr1-dev-plus-aosp
am:
a39117417f
Change-Id: Ie8fc46bf71323d08973361983006e0c4ae7ec59a
Android Build Merger (Role) [Fri, 4 Aug 2017 22:52:34 +0000 (22:52 +0000)]
Merge "Merge "Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
b8e4ff4043 am:
a2d901c3d8 am:
2431a0b0d9 am:
5fe6ec300f am:
781a2ef1e0 am:
b85caaf64f am:
fff2e81d5b" into oc-dr1-dev-plus-aosp am:
9cd00ac01b" into oc-mr1-dev-plus-aosp
Graeme Leese [Fri, 4 Aug 2017 22:52:08 +0000 (22:52 +0000)]
Merge "Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
b8e4ff4043 am:
a2d901c3d8 am:
2431a0b0d9 am:
5fe6ec300f am:
781a2ef1e0 am:
b85caaf64f am:
fff2e81d5b" into oc-dr1-dev-plus-aosp
am:
9cd00ac01b
Change-Id: I377b70ad3957a5f70de43b646aacf6264d88b97a
Android Build Merger (Role) [Fri, 4 Aug 2017 22:52:01 +0000 (22:52 +0000)]
Merge "Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
b8e4ff4043 am:
a2d901c3d8 am:
2431a0b0d9 am:
5fe6ec300f am:
781a2ef1e0 am:
b85caaf64f am:
456d849dfb am:
46c216fa87" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 4 Aug 2017 22:51:58 +0000 (22:51 +0000)]
Merge "Merge "Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
5bd0fb31a1 am:
3558abf238 am:
222fa619e5 am:
37ce9a1ac7 am:
1801be75eb am:
111e3a2323" into oc-dr1-dev-plus-aosp am:
ec41d83f07" into oc-mr1-dev-plus-aosp
Graeme Leese [Fri, 4 Aug 2017 22:51:29 +0000 (22:51 +0000)]
Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
b8e4ff4043 am:
a2d901c3d8 am:
2431a0b0d9 am:
5fe6ec300f am:
781a2ef1e0 am:
b85caaf64f am:
456d849dfb
am:
46c216fa87
Change-Id: I17e11e11fe47d6c0f11b0db3796d095ca079db0f
Graeme Leese [Fri, 4 Aug 2017 22:51:27 +0000 (22:51 +0000)]
Merge "Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
5bd0fb31a1 am:
3558abf238 am:
222fa619e5 am:
37ce9a1ac7 am:
1801be75eb am:
111e3a2323" into oc-dr1-dev-plus-aosp
am:
ec41d83f07
Change-Id: Ia6fa87823a5e05908ab622c8d52536ac365e131f
Android Build Merger (Role) [Fri, 4 Aug 2017 22:51:22 +0000 (22:51 +0000)]
Merge "Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
5bd0fb31a1 am:
3558abf238 am:
222fa619e5 am:
37ce9a1ac7 am:
1801be75eb am:
111e3a2323 am:
1b86cc48ff" into oc-mr1-dev-plus-aosp
Graeme Leese [Fri, 4 Aug 2017 22:51:09 +0000 (22:51 +0000)]
Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
5bd0fb31a1 am:
3558abf238 am:
222fa619e5 am:
37ce9a1ac7 am:
1801be75eb am:
111e3a2323
am:
1b86cc48ff
Change-Id: Ia4bfcd77e906397b9b328696ad11436eca958601
Graeme Leese [Fri, 4 Aug 2017 22:51:09 +0000 (22:51 +0000)]
Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
5bd0fb31a1 am:
3558abf238 am:
222fa619e5 am:
37ce9a1ac7 am:
1801be75eb am:
c2fa08f20a
am:
c92f24a87b
Change-Id: I581f8f6e49cff6503c28e149b682b977c02d3e36
Android Build Merger (Role) [Fri, 4 Aug 2017 22:45:42 +0000 (22:45 +0000)]
Merge "Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
b8e4ff4043 am:
a2d901c3d8 am:
2431a0b0d9 am:
5fe6ec300f am:
781a2ef1e0 am:
b85caaf64f am:
456d849dfb" into oc-dr1-dev-plus-aosp
Graeme Leese [Fri, 4 Aug 2017 22:45:35 +0000 (22:45 +0000)]
Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
b8e4ff4043 am:
a2d901c3d8 am:
2431a0b0d9 am:
5fe6ec300f am:
781a2ef1e0 am:
b85caaf64f
am:
456d849dfb
Change-Id: I6d8aa3fd4a89383ab701a463eb929af6791518a4
Android Build Merger (Role) [Fri, 4 Aug 2017 22:45:32 +0000 (22:45 +0000)]
Merge "Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
b8e4ff4043 am:
a2d901c3d8 am:
2431a0b0d9 am:
5fe6ec300f am:
781a2ef1e0 am:
b85caaf64f am:
fff2e81d5b" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 4 Aug 2017 22:45:27 +0000 (22:45 +0000)]
Merge "Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
5bd0fb31a1 am:
3558abf238 am:
222fa619e5 am:
37ce9a1ac7 am:
1801be75eb am:
111e3a2323" into oc-dr1-dev-plus-aosp
Graeme Leese [Fri, 4 Aug 2017 22:45:26 +0000 (22:45 +0000)]
Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
b8e4ff4043 am:
a2d901c3d8 am:
2431a0b0d9 am:
5fe6ec300f am:
781a2ef1e0 am:
b85caaf64f
am:
fff2e81d5b
Change-Id: I9fd3dbd0b63a5ddce3011a4555a13416c7e770b8
Graeme Leese [Fri, 4 Aug 2017 22:45:25 +0000 (22:45 +0000)]
Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
b8e4ff4043 am:
a2d901c3d8 am:
2431a0b0d9 am:
5fe6ec300f am:
781a2ef1e0 am:
b85caaf64f
am:
456d849dfb
Change-Id: I6ef9440c4f36702891798cd7affe9039f2cf485b
Graeme Leese [Fri, 4 Aug 2017 22:45:12 +0000 (22:45 +0000)]
Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
5bd0fb31a1 am:
3558abf238 am:
222fa619e5 am:
37ce9a1ac7 am:
1801be75eb
am:
111e3a2323
Change-Id: Ie0c9bc999c2cebb97cb629b2822e13cbc201f87f
Graeme Leese [Fri, 4 Aug 2017 22:45:10 +0000 (22:45 +0000)]
Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
5bd0fb31a1 am:
3558abf238 am:
222fa619e5 am:
37ce9a1ac7 am:
1801be75eb
am:
111e3a2323
Change-Id: I7a5530a47e9f7ca247b5ef7eef452beec46b2dbd
Graeme Leese [Fri, 4 Aug 2017 22:45:08 +0000 (22:45 +0000)]
Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
5bd0fb31a1 am:
3558abf238 am:
222fa619e5 am:
37ce9a1ac7 am:
1801be75eb
am:
c2fa08f20a
Change-Id: I3de981abbef67723727b5302b20d5bbbb1b0cf90
Graeme Leese [Fri, 4 Aug 2017 22:39:35 +0000 (22:39 +0000)]
Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
b8e4ff4043 am:
a2d901c3d8 am:
2431a0b0d9 am:
5fe6ec300f am:
781a2ef1e0
am:
b85caaf64f
Change-Id: I0ffe084557f992e2d559d6abc115c9760e0d3df0
Graeme Leese [Fri, 4 Aug 2017 22:39:26 +0000 (22:39 +0000)]
Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
b8e4ff4043 am:
a2d901c3d8 am:
2431a0b0d9 am:
5fe6ec300f am:
781a2ef1e0
am:
b85caaf64f
Change-Id: If808dc4b855853cc5b2c08b228b90b4ffb594bc2
Graeme Leese [Fri, 4 Aug 2017 22:39:11 +0000 (22:39 +0000)]
Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
5bd0fb31a1 am:
3558abf238 am:
222fa619e5 am:
37ce9a1ac7
am:
1801be75eb
Change-Id: I53ce79df88d1a9fe3069d9814c21b09ce7e7a333
Graeme Leese [Fri, 4 Aug 2017 22:39:07 +0000 (22:39 +0000)]
Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
5bd0fb31a1 am:
ea24f81118 am:
9485e519fd am:
ee9b5b7b6d
am:
ee000236df
Change-Id: I3bd5fa1c491a5ba2e421bd27c0c063562eecbea3
Graeme Leese [Fri, 4 Aug 2017 22:39:07 +0000 (22:39 +0000)]
Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
5bd0fb31a1 am:
3558abf238 am:
222fa619e5 am:
37ce9a1ac7
am:
1801be75eb
Change-Id: If598f5251c48ab9d40eacb45acbe31a9fad51916
Graeme Leese [Fri, 4 Aug 2017 22:33:28 +0000 (22:33 +0000)]
Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
b8e4ff4043 am:
a2d901c3d8 am:
2431a0b0d9 am:
5fe6ec300f
am:
781a2ef1e0
Change-Id: I88ecd39f47d5c87973d92db0570e1a4dd46e3c27