Dan Willemsen
d111debc18
resolve merge conflicts of 8dadc2d
to nyc-mr1-dev-plus-aosp
...
Change-Id: I296a81c17f9311a9425619141e1b5f5f5fb4c0dc
2016-09-12 21:43:19 -07:00
Dan Willemsen
8dadc2d2e6
Merge "Remove incremental workaround for aapt overlays" am: 946e58bdff
...
am: cd573e3aef
Change-Id: I7f90596676af64202fe17f76beb49f0a61a0dc1b
2016-09-13 04:38:22 +00:00
Dan Willemsen
cd573e3aef
Merge "Remove incremental workaround for aapt overlays"
...
am: 946e58bdff
Change-Id: I44a7d1be8ea317e3ce861b2ce0418b112f80a323
2016-09-13 04:35:52 +00:00
Treehugger Robot
946e58bdff
Merge "Remove incremental workaround for aapt overlays"
2016-09-13 04:29:37 +00:00
Dan Willemsen
8e6e6fdba9
Remove incremental workaround for aapt overlays
...
This workaround to clean package intermediates is no longer necessary,
as ninja reruns commands whose command line changes.
Test: switch between product overlays that use add-resource, verify
R.java is regenerated.
Change-Id: Icb1f76360e39882e4401180414a031956777b020
2016-09-12 20:30:12 -07:00
Alan Viverette
3f9a6a5932
Merge "Add transition support library to docs path to fix build" into nyc-mr1-dev am: 50c3f3e618
...
am: ca9866a39b
Change-Id: Ie39f06a485dff68612411e703c4799d3a18db940
2016-09-13 02:27:25 +00:00
Alan Viverette
c33fe0838d
Add transition support library to docs path to fix build am: 9c535433df
...
am: ec58ebb4ee
Change-Id: I88faba8d91efcd113244c3984ddb7a4ce59968ab
2016-09-13 02:27:19 +00:00
Alan Viverette
ca9866a39b
Merge "Add transition support library to docs path to fix build" into nyc-mr1-dev
...
am: 50c3f3e618
Change-Id: I51d674b7a7412131f6b132888fe51cbed86f921e
2016-09-13 02:22:25 +00:00
Alan Viverette
ec58ebb4ee
Add transition support library to docs path to fix build
...
am: 9c535433df
Change-Id: I432a666e4a1c8d62ec5bb7414f2b2c90efd79892
2016-09-13 02:22:17 +00:00
TreeHugger Robot
50c3f3e618
Merge "Add transition support library to docs path to fix build" into nyc-mr1-dev
2016-09-13 02:15:31 +00:00
Dan Willemsen
73da86ee11
Merge "Remove speex from the pathmap" am: fbfff3129e
am: 7da7001c18
...
am: 50e79ad9ce
Change-Id: I79f1ad4aedd657fbaf66e2f9e64dd4c7e9231006
2016-09-13 00:21:35 +00:00
Dan Willemsen
50e79ad9ce
Merge "Remove speex from the pathmap" am: fbfff3129e
...
am: 7da7001c18
Change-Id: I2af31462ac7a45c2ac0d3d5f5335c6081fbae7d2
2016-09-13 00:19:05 +00:00
Dan Willemsen
7da7001c18
Merge "Remove speex from the pathmap"
...
am: fbfff3129e
Change-Id: I3e1460124b235555860296363c065e24f872991c
2016-09-13 00:16:05 +00:00
Treehugger Robot
fbfff3129e
Merge "Remove speex from the pathmap"
2016-09-13 00:07:28 +00:00
Dan Willemsen
208d3c2461
Remove speex from the pathmap
...
libspeexresampler uses LOCAL_EXPORT_C_INCLUDE_DIRS to export this path
to all of its users already.
Test: m libaudiopreprocessing libaudioutils
Change-Id: I682303142840d6f0f02c990de8e713620840bbda
2016-09-12 16:16:50 -07:00
Dan Albert
45fe3712fc
Merge "Update NDK gtest lib names." am: 56c2a18a50
am: 146540b535
...
am: 5eb8f65378
Change-Id: If949af2958f4cf844b844f69e1311bcb9ab6b4fe
2016-09-12 21:24:56 +00:00
Dan Albert
5eb8f65378
Merge "Update NDK gtest lib names." am: 56c2a18a50
...
am: 146540b535
Change-Id: I32717473ff1d38f8abca819eb0b21ccfc9153d59
2016-09-12 21:09:54 +00:00
Dan Albert
146540b535
Merge "Update NDK gtest lib names."
...
am: 56c2a18a50
Change-Id: Ib8b6996027020fa8bc1d17f8d1286915c534d94b
2016-09-12 21:00:26 +00:00
Treehugger Robot
56c2a18a50
Merge "Update NDK gtest lib names."
2016-09-12 20:48:42 +00:00
Dan Willemsen
2277a46756
Merge "Fix libgcov.a dependency" am: f9d5fb97cb
am: 4b9f214a7b
...
am: 64deaba889
Change-Id: I3648ae9652438dddde23afb7bd6392751bbae442
2016-09-12 19:23:13 +00:00
Dan Willemsen
64deaba889
Merge "Fix libgcov.a dependency" am: f9d5fb97cb
...
am: 4b9f214a7b
Change-Id: Ia4aadb15b81c53014b135ff09d24b3641789b96b
2016-09-12 19:19:42 +00:00
Dan Willemsen
4b9f214a7b
Merge "Fix libgcov.a dependency"
...
am: f9d5fb97cb
Change-Id: I38c4783f80976cc6cdf1dd3066d9bd9680efb4a8
2016-09-12 19:16:41 +00:00
Treehugger Robot
f9d5fb97cb
Merge "Fix libgcov.a dependency"
2016-09-12 19:06:54 +00:00
Dan Willemsen
7db70a3b0a
Fix libgcov.a dependency
...
Now that Soong is generating libgcov.a, we need a dependency here.
Change-Id: Ie8d97339fd584eed178cc57b9333d38754ab1135
2016-09-12 18:09:20 +00:00
Dan Stoza
ccb52fe803
Merge "Remove DispSync default value/docs" into nyc-mr1-dev am: ff0fd30f88
...
am: 2d060aa575
Change-Id: Idce0ec9ff03bc5e117ec9cc44035019747f27d51
2016-09-12 17:55:06 +00:00
Dan Stoza
cddda45883
Remove DispSync default value/docs am: ae5e550f81
...
am: 92df306bd9
Change-Id: I0b21afde084512b622f74983456491749aa7c5a7
2016-09-12 17:51:17 +00:00
Dan Stoza
2d060aa575
Merge "Remove DispSync default value/docs" into nyc-mr1-dev
...
am: ff0fd30f88
Change-Id: Ic068ffb596793653ee4b0091f561489312a3b37c
2016-09-12 17:49:53 +00:00
Dan Stoza
92df306bd9
Remove DispSync default value/docs
...
am: ae5e550f81
Change-Id: I0d596a0fed1cf454110ce9e39891be5a6b2c87d2
2016-09-12 17:48:15 +00:00
Dan Stoza
ff0fd30f88
Merge "Remove DispSync default value/docs" into nyc-mr1-dev
2016-09-12 17:37:52 +00:00
David Brazdil
29441f934d
resolve merge conflicts of 0976590
to nyc-mr1-dev-plus-aosp
...
Change-Id: I67a45fd1d034f143e9605cc2576c16aea4f8dbc9
2016-09-12 16:58:12 +01:00
David Brazdil
0976590e04
Merge "Update build rules for VDEX" am: 3a04e1b82f
...
am: 50513362fa
Change-Id: I41040711c09e7cd514c7df33ba3f33350990acd1
2016-09-12 15:09:08 +00:00
David Brazdil
50513362fa
Merge "Update build rules for VDEX"
...
am: 3a04e1b82f
Change-Id: I6f50ba38c35277892ecc1fcc262eed9ffa533aa5
2016-09-12 15:05:39 +00:00
David Brazdil
3a04e1b82f
Merge "Update build rules for VDEX"
2016-09-12 14:57:19 +00:00
Scott Main
b1d673327d
Merge "add support for constraint layout's DATA list" into nyc-dev am: 64bd41ff7d
am: be56d3b2b2
am: 01fd07b19d
...
am: 79306ec126
Change-Id: Id2e35910cf948c98865a1407b1fbd9a1c87add74
2016-09-10 01:43:54 +00:00
smain@google.com
148634a6e6
add support for constraint layout's DATA list am: 7055897faa
am: 210083ab97
am: 6fee24869b
...
am: 4330a151cd
Change-Id: Ic56defeb7f2b27ef5376dde19fbce13094c7ed3a
2016-09-10 01:43:54 +00:00
Scott Main
79306ec126
Merge "add support for constraint layout's DATA list" into nyc-dev am: 64bd41ff7d
am: be56d3b2b2
...
am: 01fd07b19d
Change-Id: Ie3703fbba98d9b63b8943a91765f8c3babc2b636
2016-09-10 01:37:52 +00:00
Scott Main
54f8700faf
Merge "add support for constraint layout's DATA list" into nyc-dev am: 64bd41ff7d
...
am: de4cdad1fd
Change-Id: I8cfd6fefc3938d015a9078788f20060a4400e53e
2016-09-10 01:37:52 +00:00
smain@google.com
0070d17b04
add support for constraint layout's DATA list am: 7055897faa
...
am: bca27e5836
Change-Id: I9689cfe6088637a6702d8bee52835eb7ff19a33c
2016-09-10 01:37:52 +00:00
smain@google.com
4330a151cd
add support for constraint layout's DATA list am: 7055897faa
am: 210083ab97
...
am: 6fee24869b
Change-Id: I422c3feb38337c2426eec264fca0c35a3b99d6ae
2016-09-10 01:37:51 +00:00
Scott Main
01fd07b19d
Merge "add support for constraint layout's DATA list" into nyc-dev am: 64bd41ff7d
...
am: be56d3b2b2
Change-Id: Ie3b6e3504cd6d45e8214e7a688a3f1c5d12100e5
2016-09-10 01:35:21 +00:00
smain@google.com
6fee24869b
add support for constraint layout's DATA list am: 7055897faa
...
am: 210083ab97
Change-Id: Ic55ead4d5ceda3c937a62fd1b82c35b6de60af63
2016-09-10 01:35:21 +00:00
Scott Main
de4cdad1fd
Merge "add support for constraint layout's DATA list" into nyc-dev
...
am: 64bd41ff7d
Change-Id: Iece4de40cbd0854165e39767ef379a4b75fb66b5
2016-09-10 01:33:18 +00:00
smain@google.com
bca27e5836
add support for constraint layout's DATA list
...
am: 7055897faa
Change-Id: Ibce59cf7867e6a197a39873453dae8336419e233
2016-09-10 01:33:17 +00:00
Scott Main
be56d3b2b2
Merge "add support for constraint layout's DATA list" into nyc-dev
...
am: 64bd41ff7d
Change-Id: I93e87b680a6bba3d90de2ef4f8f16bc02afb33ab
2016-09-10 01:32:55 +00:00
smain@google.com
210083ab97
add support for constraint layout's DATA list
...
am: 7055897faa
Change-Id: I9781454790423d51385094aaa530d994cccb1016
2016-09-10 01:32:24 +00:00
Scott Main
64bd41ff7d
Merge "add support for constraint layout's DATA list" into nyc-dev
2016-09-10 01:28:09 +00:00
smain@google.com
7055897faa
add support for constraint layout's DATA list
...
Change-Id: Ia301ad235dcfd5a5c2bb13bfa6daa753f9206800
2016-09-09 15:47:58 -07:00
Dan Stoza
ae5e550f81
Remove DispSync default value/docs
...
Moves DispSync phase offset default values and documentation to
frameworks/native/services/surfaceflinger/Android.mk.
Bug: 30801895
Change-Id: I44a4355b2d112561b94ccfc6e9c3365885c205ad
2016-09-09 13:53:52 -07:00
Colin Cross
b50e65d097
Merge "Remove global linker search paths" am: 39c1c9ae12
am: 01d1c0b442
...
am: 6b7762a458
Change-Id: I216f2ec8c20182745edd25c442360b9303b52ad2
2016-09-09 20:40:29 +00:00
Alan Viverette
9c535433df
Add transition support library to docs path to fix build
...
Change-Id: I277df6af728aea4aaa5b10605cf2a6a44c2a246f
2016-09-09 16:39:18 -04:00