Dan Willemsen
4cb7686365
resolve merge conflicts of 8dadc2d
to nyc-mr1-dev-plus-aosp
...
am: d111debc18
Change-Id: If1706cc449750030bedb56ecf1f2e60a91105ea3
2016-09-14 03:05:49 +00:00
Alan Viverette
2a6147fdf1
Merge "Add transition support library to docs path to fix build" into nyc-mr1-dev am: 50c3f3e618
am: ca9866a39b
...
am: 3f9a6a5932
Change-Id: Ibca94be645ebb97a6c097498873a36cc31e1d449
2016-09-14 02:56:57 +00:00
Alan Viverette
adb1ed34f8
Add transition support library to docs path to fix build am: 9c535433df
am: ec58ebb4ee
...
am: c33fe0838d
Change-Id: I4e27adc8e0ed30e1c0705a57bc7f7919fb11022d
2016-09-14 02:56:44 +00:00
Julien Desprez
2261b809b6
Merge "Export the cts tests jar required to run unit tests"
2016-09-13 07:48:15 +00:00
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
15346d5e2d
Merge "Remove speex from the pathmap" am: fbfff3129e
am: 7da7001c18
am: 50e79ad9ce
...
am: 73da86ee11
Change-Id: Id2e6e6d5e9aee416d43794c0f0634b1f51fbe14d
2016-09-13 00:51:24 +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
53e9e510a4
Merge "Update NDK gtest lib names." am: 56c2a18a50
am: 146540b535
am: 5eb8f65378
...
am: 45fe3712fc
Change-Id: Ia4be846ad7e59dae07dec3eee9df2f2f986c5010
2016-09-12 21:32:33 +00: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
8eb4d8589d
Merge "Fix libgcov.a dependency" am: f9d5fb97cb
am: 4b9f214a7b
am: 64deaba889
...
am: 2277a46756
Change-Id: I57dc91cf9b928b4f1b6661474b653e453e2f9041
2016-09-12 19:42:17 +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
c06b52bf99
Merge "Remove DispSync default value/docs" into nyc-mr1-dev am: ff0fd30f88
am: 2d060aa575
...
am: ccb52fe803
Change-Id: Iea64e87e462ffa747cd9214ada9658a110c420eb
2016-09-12 18:08:36 +00:00
Dan Stoza
8b0d255331
Remove DispSync default value/docs am: ae5e550f81
am: 92df306bd9
...
am: cddda45883
Change-Id: I3073c1f3b7d4de885519a9f0a9120069687a37d3
2016-09-12 18:03:38 +00:00
David Brazdil
c92f18fb90
resolve merge conflicts of 0976590
to nyc-mr1-dev-plus-aosp
...
am: 29441f934d
Change-Id: I52cb95860580feea89b82f7ccb6d865b67964228
2016-09-12 18:03:11 +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
Julien Desprez
7b10950b8a
Export the cts tests jar required to run unit tests
...
Bug: 31393228
Change-Id: Id5ce5beccd70c67be6d4bfed01f7206a48498fc2
2016-09-12 11:19:48 +01:00
Scott Main
01628bc56e
Merge "add support for constraint layout's DATA list" into nyc-dev am: 64bd41ff7d
am: be56d3b2b2
am: 01fd07b19d
am: 79306ec126
...
am: b1d673327d
Change-Id: I09a7c7e21dcd54c1f854c0e3b5fdec89bd571626
2016-09-10 01:50:22 +00:00
smain@google.com
b9e4e01047
add support for constraint layout's DATA list am: 7055897faa
am: 210083ab97
am: 6fee24869b
am: 4330a151cd
...
am: 148634a6e6
Change-Id: Ie2e86f1c07f1d097329dae96b661007a0f95e980
2016-09-10 01:50:21 +00:00
Scott Main
0c608a1b8b
Merge "add support for constraint layout's DATA list" into nyc-dev am: 64bd41ff7d
am: de4cdad1fd
...
am: 54f8700faf
Change-Id: Ic36efb494d2ead67a53eef854ca03579c937bd5d
2016-09-10 01:50:20 +00:00
smain@google.com
1d36912842
add support for constraint layout's DATA list am: 7055897faa
am: bca27e5836
...
am: 0070d17b04
Change-Id: Ic64f129d5e714f07272fca0fe1ff324da8627f5f
2016-09-10 01:50:20 +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