Tomasz Mikolajewski
2b09bc8177
Revert "Merge "Add documents-archive to SDK, docs builds" into nyc-dev am: 88b0d6a63d
am: 88c45e1415
am: dfb9f231ac"
...
This support library is removed from O.
This reverts commit 51b338808b
.
Change-Id: Iffb1bc6f8eaa7ccce53a7ded9c32163a468dc30e
2016-10-14 03:50:48 +00:00
Alan Viverette
51b338808b
Merge "Add documents-archive to SDK, docs builds" into nyc-dev am: 88b0d6a63d
am: 88c45e1415
...
am: dfb9f231ac
* commit 'dfb9f231ac7206b40b2964ef9a9654c029dde816':
Add documents-archive to SDK, docs builds
Change-Id: I7243a4d2c1e527410287897f918b64aa5e7061ec
2016-05-19 20:07:35 +00:00
Alan Viverette
dfb9f231ac
Merge "Add documents-archive to SDK, docs builds" into nyc-dev am: 88b0d6a63d
...
am: 88c45e1415
* commit '88c45e1415f3b30702e02f4789f4c52e957a1eb3':
Add documents-archive to SDK, docs builds
Change-Id: I2d9feb820a28e97cccb9c5324e95c8846ac98cd3
2016-05-19 19:53:05 +00:00
Alan Viverette
88c45e1415
Merge "Add documents-archive to SDK, docs builds" into nyc-dev
...
am: 88b0d6a63d
* commit '88b0d6a63d8149d14032d298eccde79a6d3079d4':
Add documents-archive to SDK, docs builds
Change-Id: I2c07f2f20da849174d23dfe6ab5c81008c37c6b1
2016-05-19 19:48:49 +00:00
Alan Viverette
88b0d6a63d
Merge "Add documents-archive to SDK, docs builds" into nyc-dev
2016-05-19 19:39:11 +00:00
Baligh Uddin
6e7e8354e7
Merge "DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am: 74da4d6eef
am: cea440c2eb
am: 9606ea8a43
-s ours am: 3c42a21466
am: 4c8e743fa5" into nyc-mr1-dev-plus-aosp
...
am: 2ae3c282d5
-s ours
* commit '2ae3c282d5a14d370afa0bd194ebaafa396c28d9':
Change-Id: I15f7cfe61bfdb4a02adf66bb03b8d65989f333c5
2016-05-19 17:04:50 +00:00
Baligh Uddin
34ed164a4f
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am: 74da4d6eef
am: cea440c2eb
am: 9606ea8a43
-s ours am: 3c42a21466
am: 37cbef1b1c
...
am: 4d60bb83bb
-s ours
* commit '4d60bb83bbba14e315daff03169ef64334db2b04':
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
Change-Id: I993e9c127e57c7e2e4e42b649e5e08e183bae658
2016-05-19 17:04:48 +00:00
Android Build Merger (Role)
2ae3c282d5
Merge "DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am: 74da4d6eef
am: cea440c2eb
am: 9606ea8a43
-s ours am: 3c42a21466
am: 4c8e743fa5" into nyc-mr1-dev-plus-aosp
2016-05-19 17:00:46 +00:00
Baligh Uddin
4d60bb83bb
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am: 74da4d6eef
am: cea440c2eb
am: 9606ea8a43
-s ours am: 3c42a21466
...
am: 37cbef1b1c
* commit '37cbef1b1c04da1a5e036b596a44377cad7eb0e5':
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
Change-Id: I36789c7088d5f506279abab189fa2c32ac04f4d0
2016-05-19 17:00:37 +00:00
Baligh Uddin
f5481a7ea7
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am: 74da4d6eef
am: cea440c2eb
am: 9606ea8a43
-s ours am: 3c42a21466
...
am: 4c8e743fa5
* commit '4c8e743fa5852474983c9735804e2e38d65862cf':
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
Change-Id: I440a770367c5d2752a9b3205c839768b87c8afaa
2016-05-19 17:00:37 +00:00
Baligh Uddin
37cbef1b1c
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am: 74da4d6eef
am: cea440c2eb
am: 9606ea8a43
-s ours
...
am: 3c42a21466
* commit '3c42a2146612209e7b8eab749cbafe7f0782e942':
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
Change-Id: I173d5494f192dc907ae5e6db1e6318bfe66b38c4
2016-05-19 16:56:20 +00:00
Baligh Uddin
4c8e743fa5
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am: 74da4d6eef
am: cea440c2eb
am: 9606ea8a43
-s ours
...
am: 3c42a21466
* commit '3c42a2146612209e7b8eab749cbafe7f0782e942':
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
Change-Id: I1d33fe6afec785e30fc57f62780920f1bb813e3c
2016-05-19 16:56:20 +00:00
Baligh Uddin
3c42a21466
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am: 74da4d6eef
am: cea440c2eb
...
am: 9606ea8a43
-s ours
* commit '9606ea8a4306ac2be9b3d9c17ad7dc890cf25170':
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
Change-Id: Ia925f396973716d5fcd3120a74b0c44ad99a99fc
2016-05-19 16:52:12 +00:00
Baligh Uddin
9606ea8a43
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am: 74da4d6eef
...
am: cea440c2eb
* commit 'cea440c2ebb8982158adc8bebf3a4cd85a5950fd':
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
Change-Id: Ia8380c1e5f81d7225baee928ba2a35290aca4f85
2016-05-19 16:47:58 +00:00
Baligh Uddin
cea440c2eb
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
...
am: 74da4d6eef
* commit '74da4d6eef1da6490729dfbd069adf913d9aa6fa':
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
Change-Id: Iefc0f7c90f631d6298931c9426d8edfbb60aa437
2016-05-19 16:43:34 +00:00
Baligh Uddin
74da4d6eef
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
...
otatools.zip is used to release key sign device images.
Bug: 23967152
2016-05-19 08:50:19 -07:00
Andreas Gampe
e2805c1b3f
Merge "Build: Use phone compiled-classes in core_minimal am: 695b28f67c
am: ea33f4f768" into nyc-mr1-dev-plus-aosp
...
am: 11c776d388
* commit '11c776d388ed6b44ee57539c4bdc00bc70e6c406':
Change-Id: I4444501d4f24d355abe1cacfd92fbf3361affa24
2016-05-19 05:17:08 +00:00
Andreas Gampe
f35add046b
Build: Use phone compiled-classes in core_minimal am: 695b28f67c
am: 28efcb6d39
...
am: e98ef11300
* commit 'e98ef11300e5de77c15a52414e805f9757fd1cde':
Build: Use phone compiled-classes in core_minimal
Change-Id: I6c68dab4d4bd630d32b66e8113f162f801f33e40
2016-05-19 05:17:01 +00:00
Android Build Merger (Role)
11c776d388
Merge "Build: Use phone compiled-classes in core_minimal am: 695b28f67c
am: ea33f4f768" into nyc-mr1-dev-plus-aosp
2016-05-19 05:14:16 +00:00
Andreas Gampe
e98ef11300
Build: Use phone compiled-classes in core_minimal am: 695b28f67c
...
am: 28efcb6d39
* commit '28efcb6d39c065da8831e542793d3ddf10c4d4c1':
Build: Use phone compiled-classes in core_minimal
Change-Id: I83b72249a82c8a1992718050de65048e212da3ce
2016-05-19 05:13:56 +00:00
Andreas Gampe
1659ff924d
Build: Use phone compiled-classes in core_minimal am: 695b28f67c
...
am: ea33f4f768
* commit 'ea33f4f768a7d056139514ecded09aa61db2d8f2':
Build: Use phone compiled-classes in core_minimal
Change-Id: Iffaa23320311c6e7e97b8088433db3d3ce040dc0
2016-05-19 05:13:56 +00:00
Andreas Gampe
28efcb6d39
Build: Use phone compiled-classes in core_minimal
...
am: 695b28f67c
* commit '695b28f67c88b87486911f8881078e7857e989a8':
Build: Use phone compiled-classes in core_minimal
Change-Id: I3b3a362c17c741994b34a2f70301806eadf9098d
2016-05-19 05:10:55 +00:00
Andreas Gampe
ea33f4f768
Build: Use phone compiled-classes in core_minimal
...
am: 695b28f67c
* commit '695b28f67c88b87486911f8881078e7857e989a8':
Build: Use phone compiled-classes in core_minimal
Change-Id: I00488cf31df5b997de619656dd7541788747fb18
2016-05-19 05:10:54 +00:00
Andreas Gampe
695b28f67c
Build: Use phone compiled-classes in core_minimal
...
Use default phone compiled-classes list to cut down boot image
size on most devices.
Bug: 28026683
Change-Id: I73bb59b792923ebc7549f775085b1c9aed88cc1a
2016-05-18 20:10:43 -07:00
Dan Willemsen
cde5dafe4e
Merge "Windows: Stop adding to GLOBAL_LD_DIRS" am: e23a49157f
am: 84eb1d2cca
am: dcfa920235
...
am: caac8033f8
* commit 'caac8033f8ca9dac060bb87c08ef14c60972414d':
Windows: Stop adding to GLOBAL_LD_DIRS
Change-Id: I71394a2f7940f88ed780567885c99a92b5ace349
2016-05-19 01:32:21 +00:00
Dan Willemsen
caac8033f8
Merge "Windows: Stop adding to GLOBAL_LD_DIRS" am: e23a49157f
am: 84eb1d2cca
...
am: dcfa920235
* commit 'dcfa9202356af860419e92aceae78563a044818a':
Windows: Stop adding to GLOBAL_LD_DIRS
Change-Id: Ieeb6f2894a4d7b419d5424193a29927af3974bb8
2016-05-19 01:28:57 +00:00
Dan Willemsen
dcfa920235
Merge "Windows: Stop adding to GLOBAL_LD_DIRS" am: e23a49157f
...
am: 84eb1d2cca
* commit '84eb1d2ccad40ecffa989fe0babf1c4a9c589f0a':
Windows: Stop adding to GLOBAL_LD_DIRS
Change-Id: I4e8de34d50c0ab9e57e2f7c3801b2e1b4d9a981b
2016-05-19 01:26:05 +00:00
Dan Willemsen
84eb1d2cca
Merge "Windows: Stop adding to GLOBAL_LD_DIRS"
...
am: e23a49157f
* commit 'e23a49157f34a3c3f82115a117908d32b14a6262':
Windows: Stop adding to GLOBAL_LD_DIRS
Change-Id: I8b834feed668c311169ec5da294414f47d4175be
2016-05-19 01:23:22 +00:00
Dan Willemsen
e23a49157f
Merge "Windows: Stop adding to GLOBAL_LD_DIRS"
2016-05-19 01:09:28 +00:00
Dan Willemsen
3a0efd7957
Merge "Remove trailing newline from TARGET_C_INCLUDES" am: 6864e3790c
am: cb0bccf423
am: 30296f6b94
...
am: 0af09cfa3d
* commit '0af09cfa3d2c77ed023c5cb3bf831da6568ade74':
Remove trailing newline from TARGET_C_INCLUDES
Change-Id: I1e030d5f4562032cb0a2ba12ac58624f7b11e65d
2016-05-19 00:22:29 +00:00
Dan Willemsen
0af09cfa3d
Merge "Remove trailing newline from TARGET_C_INCLUDES" am: 6864e3790c
am: cb0bccf423
...
am: 30296f6b94
* commit '30296f6b9432b3fff26544ec6a4c03592c372030':
Remove trailing newline from TARGET_C_INCLUDES
Change-Id: I25b1f83a179792608c34323c1d776cd37fbfd806
2016-05-19 00:16:11 +00:00
Dan Willemsen
30296f6b94
Merge "Remove trailing newline from TARGET_C_INCLUDES" am: 6864e3790c
...
am: cb0bccf423
* commit 'cb0bccf42335b4f389e1e3efa2f8681e9b0b2abe':
Remove trailing newline from TARGET_C_INCLUDES
Change-Id: Ibdaec09f72aa7831a141e1130700840235569d8b
2016-05-19 00:08:00 +00:00
Dan Willemsen
cb0bccf423
Merge "Remove trailing newline from TARGET_C_INCLUDES"
...
am: 6864e3790c
* commit '6864e3790c80d3044307f0d260cf0e2b962ae82d':
Remove trailing newline from TARGET_C_INCLUDES
Change-Id: I615050a58cca90291f2c07cae4397a711c69e585
2016-05-19 00:05:26 +00:00
Dan Willemsen
3fe3248c36
Windows: Stop adding to GLOBAL_LD_DIRS
...
Soong does not have the idea of global linking directories, so move the
windows prebuilt library directory to GLOBAL_LDFLAGS instead.
Change-Id: Ie101146f4682cd85924463aa5acaa46869938e6c
2016-05-18 16:50:46 -07:00
Dan Willemsen
6864e3790c
Merge "Remove trailing newline from TARGET_C_INCLUDES"
2016-05-18 23:50:27 +00:00
Dan Willemsen
5baaba771c
Remove trailing newline from TARGET_C_INCLUDES
...
In preparation for comparing with the Soong variable.
Change-Id: I159507757ed7678a33a3c94e6d01d170485e251a
2016-05-18 15:38:04 -07:00
Tao Bao
a0bba60e8f
Merge "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"" into nyc-mr1-dev am: dd24d65d2f
...
am: 5b195bf082
* commit '5b195bf082faed726906c4386f0096a416789f41':
Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"
Change-Id: I92995722867b890c84a6c075a7341d2cc466c4f1
2016-05-18 22:12:24 +00:00
Tao Bao
fef5f8e92b
Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"
...
This reverts commit 439971af5d
.
Bug: 28713307
Bug: 28817009
Bug: 28767393
Change-Id: I96c9ec9e3f1be6d68eb77df596707568e344a2fc
(cherry picked from commit 295ad1f1f1
)
2016-05-18 22:11:29 +00:00
Tao Bao
5b195bf082
Merge "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"" into nyc-mr1-dev
...
am: dd24d65d2f
* commit 'dd24d65d2fb563d30db175ada8230978e81ba27f':
Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"
Change-Id: Ib9f4de25f04147dffd2ae67e35125706a8132a78
2016-05-18 22:09:42 +00:00
Ian Pedowitz
36a4a6e114
Merge "Revert "Setting PLATFORM_VERSION(_CODENAME)? to O for master""
2016-05-18 22:09:12 +00:00
Ian Pedowitz
301d87850e
Revert "Setting PLATFORM_VERSION(_CODENAME)? to O for master"
...
This reverts commit 1a737095c1
.
Bug: 28713307
Bug: 28767393
Change-Id: I355e7e6b9c785f7ca92d13eea7730449cfe80653
2016-05-18 22:06:51 +00:00
Tao Bao
dd24d65d2f
Merge "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"" into nyc-mr1-dev
2016-05-18 21:59:48 +00:00
Alex Light
8ec3465ffa
Merge "Add fake libart" am: 49a4be8130
am: c7e74a370a
am: 8354ee5e9d
...
am: 1313e5416a
* commit '1313e5416a077413ab7f69bd81b8108820018ba2':
Add fake libart
Change-Id: I97cf1ace07771a2946a405f432e5767da5aebde0
2016-05-18 21:25:02 +00:00
Alex Light
1313e5416a
Merge "Add fake libart" am: 49a4be8130
am: c7e74a370a
...
am: 8354ee5e9d
* commit '8354ee5e9d6ac7b61da04c47ce8483167f17f44d':
Add fake libart
Change-Id: Idb6a2b6c2960895f7f509bfae24f23091312f270
2016-05-18 21:22:27 +00:00
Alex Light
8354ee5e9d
Merge "Add fake libart" am: 49a4be8130
...
am: c7e74a370a
* commit 'c7e74a370aaf3fa6c31e6552b90f6e95fe217d06':
Add fake libart
Change-Id: I320a4d810a611b59410330ce1c48936d63158705
2016-05-18 21:20:40 +00:00
Alex Light
c7e74a370a
Merge "Add fake libart"
...
am: 49a4be8130
* commit '49a4be81304d2292bb6bd67ddaabe759d9e8c273':
Add fake libart
Change-Id: Iacc59ada5b3323c81a8c70464f5634ab722c4f2b
2016-05-18 21:17:09 +00:00
Alex Light
49a4be8130
Merge "Add fake libart"
2016-05-18 21:05:42 +00:00
Dan Willemsen
b1be6c2b24
Merge "Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS" am: ac7a7bb0ba
am: 611211acd4
am: c7f377721a
...
am: 6a08107d2a
* commit '6a08107d2a337a7bcb18cc883661110ab6215655':
Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS
Change-Id: I41083ac743d497857c8069dadbfe9491213badcf
2016-05-18 21:00:14 +00:00
Dan Willemsen
6a08107d2a
Merge "Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS" am: ac7a7bb0ba
am: 611211acd4
...
am: c7f377721a
* commit 'c7f377721a3804bb80f27a75ec95a7644d406e4b':
Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS
Change-Id: I8917b7238f15eb1610dca4ec4a900fcde378d5f8
2016-05-18 20:57:41 +00:00
Dan Willemsen
c7f377721a
Merge "Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS" am: ac7a7bb0ba
...
am: 611211acd4
* commit '611211acd40bc02773d27568d4774d8061149c52':
Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS
Change-Id: I6744e92b392c02dfcbe2154d13823a5a0a3b7693
2016-05-18 20:55:07 +00:00