OSDN Git Service
Alex Klyubin [Wed, 8 Jun 2016 15:41:22 +0000 (15:41 +0000)]
Merge \\\\"Fix DSA APK signatures for API Level 8 and lower.\\\\" am:
ebe68ec237 am:
b926969a84 am:
914b771e2f
am:
755ad9d809
Change-Id: Ie8a5371c559a1b78582091fde206aef34d5a7fc0
Alex Klyubin [Wed, 8 Jun 2016 15:36:30 +0000 (15:36 +0000)]
Merge \\\"Fix DSA APK signatures for API Level 8 and lower.\\\" am:
ebe68ec237 am:
b926969a84
am:
914b771e2f
Change-Id: Ib0a7eb8601ad563e9e81e9d3b7cbb482b4c6d5c4
Alex Klyubin [Wed, 8 Jun 2016 15:31:24 +0000 (15:31 +0000)]
Merge \\"Fix DSA APK signatures for API Level 8 and lower.\\" am:
ebe68ec237
am:
b926969a84
Change-Id: Ie93b77c066e7637cdb704d3167dc65936aca16b1
Alex Klyubin [Wed, 8 Jun 2016 15:26:16 +0000 (15:26 +0000)]
Merge \"Fix DSA APK signatures for API Level 8 and lower.\"
am:
ebe68ec237
Change-Id: I1bb11e4d47a572f5e0b9e9205910ca4dc675f671
Alex Klyubin [Wed, 8 Jun 2016 15:17:42 +0000 (15:17 +0000)]
Merge "Fix DSA APK signatures for API Level 8 and lower."
Ian Pedowitz [Wed, 8 Jun 2016 03:35:43 +0000 (03:35 +0000)]
Revert \\"Removing N from PLATFORM_VERSION_ALL_CODENAMES\\" am:
dc15ebc26c
am:
5f3f715aac -s ours
Change-Id: I725e7a591a6d3726f22ce032d885fac9fd3f4fd7
Ian Pedowitz [Wed, 8 Jun 2016 03:30:25 +0000 (03:30 +0000)]
Revert \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\"
am:
dc15ebc26c
Change-Id: I177f2c01b85c75bbee48aba3593f1a9e92237194
Ian Pedowitz [Wed, 8 Jun 2016 03:24:13 +0000 (20:24 -0700)]
Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES"
This reverts commit
5fcdec083edf0eb3cbc8cdf05626d1713df677f1.
Bug:
29194920
Bug:
28809789
Ian Pedowitz [Wed, 8 Jun 2016 03:22:45 +0000 (03:22 +0000)]
Merge \"Merge \\\"Removing N from PLATFORM_VERSION_ALL_CODENAMES\\\" into nyc-dev am:
ddc0c5e0a0 am:
0c822614f5\" into nyc-mr1-dev-plus-aosp
am:
78239a0e23
Change-Id: I114a9732e5aa78c2c914831757b94323071028f4
Ian Pedowitz [Wed, 8 Jun 2016 03:22:27 +0000 (03:22 +0000)]
Merge \\\"Removing N from PLATFORM_VERSION_ALL_CODENAMES\\\" into nyc-dev am:
ddc0c5e0a0 am:
222ab7d2dd
am:
0601612c03 -s ours
Change-Id: I30d3624d3c76706c217ba549c7b63e083615d5bf
Android Build Merger (Role) [Wed, 8 Jun 2016 03:12:24 +0000 (03:12 +0000)]
Merge "Merge \\"Removing N from PLATFORM_VERSION_ALL_CODENAMES\\" into nyc-dev am:
ddc0c5e0a0 am:
0c822614f5" into nyc-mr1-dev-plus-aosp
Ian Pedowitz [Wed, 8 Jun 2016 03:12:12 +0000 (03:12 +0000)]
Merge \\"Removing N from PLATFORM_VERSION_ALL_CODENAMES\\" into nyc-dev am:
ddc0c5e0a0
am:
222ab7d2dd
Change-Id: I72deff3996cbfb9703dca70c6ecf5bf15247978b
Ian Pedowitz [Wed, 8 Jun 2016 03:12:12 +0000 (03:12 +0000)]
Merge \\"Removing N from PLATFORM_VERSION_ALL_CODENAMES\\" into nyc-dev am:
ddc0c5e0a0
am:
0c822614f5
Change-Id: I18708266b1dfd0f955980d61b94d7c8c8457056d
Ian Pedowitz [Wed, 8 Jun 2016 03:09:44 +0000 (03:09 +0000)]
Merge \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\" into nyc-dev
am:
ddc0c5e0a0
Change-Id: I1f68aa77d52fb85a3d87a3155b9eefb1ff647c31
Ian Pedowitz [Wed, 8 Jun 2016 03:09:44 +0000 (03:09 +0000)]
Merge \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\" into nyc-dev
am:
ddc0c5e0a0
Change-Id: I9c08a086b508b78ddecc53e0aae08d25460f0595
Ian Pedowitz [Wed, 8 Jun 2016 03:05:39 +0000 (03:05 +0000)]
Merge "Removing N from PLATFORM_VERSION_ALL_CODENAMES" into nyc-dev
Gustav Sennton [Tue, 7 Jun 2016 16:38:01 +0000 (16:38 +0000)]
Merge "Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev am:
837b86aa56 am:
61e811370d" into nyc-mr1-dev-plus-aosp
am:
5a80c62e43
* commit '
5a80c62e436750050b97337f27f5aced2055abea':
Change-Id: Ic9afd84ae0265ae04fdcd8dc061e5fc71a805285
Gustav Sennton [Tue, 7 Jun 2016 16:38:00 +0000 (16:38 +0000)]
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev am:
837b86aa56 am:
1a37df5ea1
am:
f03c01a803
* commit '
f03c01a803bb5e7a28ac8fa68b88a377aa69c61e':
Add variable PRODUCT_SHIPPING_API_LEVEL.
Change-Id: I55db35b30dbafcff226e675f97ba912093562ef1
Android Build Merger (Role) [Tue, 7 Jun 2016 16:35:29 +0000 (16:35 +0000)]
Merge "Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev am:
837b86aa56 am:
61e811370d" into nyc-mr1-dev-plus-aosp
Gustav Sennton [Tue, 7 Jun 2016 16:35:18 +0000 (16:35 +0000)]
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev am:
837b86aa56
am:
1a37df5ea1
* commit '
1a37df5ea175033469165f46e2732f8ec9bb5537':
Add variable PRODUCT_SHIPPING_API_LEVEL.
Change-Id: I36d226ff72d1c9a5e340a707ed939358f5c21f33
Gustav Sennton [Tue, 7 Jun 2016 16:35:18 +0000 (16:35 +0000)]
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev am:
837b86aa56
am:
61e811370d
* commit '
61e811370dec47396ff4c0732f19b30cf1f88605':
Add variable PRODUCT_SHIPPING_API_LEVEL.
Change-Id: Ic662a8e1a6395199b2b52d170af825625ebd148f
Gustav Sennton [Tue, 7 Jun 2016 16:32:33 +0000 (16:32 +0000)]
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev
am:
837b86aa56
* commit '
837b86aa5696fea28a0acfde7361a3c5d5824624':
Add variable PRODUCT_SHIPPING_API_LEVEL.
Change-Id: I692a44938baa8e462041786b1f394dc5b41ac8e0
Gustav Sennton [Tue, 7 Jun 2016 16:32:33 +0000 (16:32 +0000)]
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev
am:
837b86aa56
* commit '
837b86aa5696fea28a0acfde7361a3c5d5824624':
Add variable PRODUCT_SHIPPING_API_LEVEL.
Change-Id: I8beb5632ed9db8cade04bf8792b5874f761c039e
Gustav Sennton [Tue, 7 Jun 2016 16:21:15 +0000 (16:21 +0000)]
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev
Dan Willemsen [Tue, 7 Jun 2016 00:15:37 +0000 (00:15 +0000)]
Merge "Add NATIVE_TESTS class, move host native tests" am:
e72fc63901 am:
10461b78f0 am:
32b36a8819
am:
cb7af16c6e
* commit '
cb7af16c6e497e5f5d553352c86f62f024472a1c':
Add NATIVE_TESTS class, move host native tests
Change-Id: I9d885e23b55e20e48ada35334de362bcd6408936
Dan Willemsen [Tue, 7 Jun 2016 00:12:16 +0000 (00:12 +0000)]
Merge "Add NATIVE_TESTS class, move host native tests" am:
e72fc63901 am:
10461b78f0
am:
32b36a8819
* commit '
32b36a88198b9e9f44c22d9103d67530ab0d8940':
Add NATIVE_TESTS class, move host native tests
Change-Id: I846592e2c77fa7823d2635f61168b11c51433bfb
Dan Willemsen [Tue, 7 Jun 2016 00:09:39 +0000 (00:09 +0000)]
Merge "Add NATIVE_TESTS class, move host native tests" am:
e72fc63901
am:
10461b78f0
* commit '
10461b78f0955d9dba8d32045d1e35ff0f9a5c8c':
Add NATIVE_TESTS class, move host native tests
Change-Id: Ia11b54676d3b33e58c177a5a375f29233657524e
Dan Willemsen [Tue, 7 Jun 2016 00:05:35 +0000 (00:05 +0000)]
Merge "Add NATIVE_TESTS class, move host native tests"
am:
e72fc63901
* commit '
e72fc639014809b4d4239d7f7754c6950f1ad546':
Add NATIVE_TESTS class, move host native tests
Change-Id: Ifb0401242afe1e6e16666001faf3d55471200c3f
Dan Willemsen [Mon, 6 Jun 2016 23:59:23 +0000 (23:59 +0000)]
Merge "Add NATIVE_TESTS class, move host native tests"
Dan Willemsen [Mon, 6 Jun 2016 23:08:58 +0000 (23:08 +0000)]
Merge "Switch some build tools to Soong" am:
c52d09e694 am:
8a78c90a95 am:
6fe82857b5
am:
d9a742b47a
* commit '
d9a742b47a9b5686e530d82acdd1652d0bf25e96':
Switch some build tools to Soong
Change-Id: I62914c356c9b0f783e99f50e1b08ce01a98af9d7
Dan Willemsen [Mon, 6 Jun 2016 23:06:22 +0000 (23:06 +0000)]
Merge "Switch some build tools to Soong" am:
c52d09e694 am:
8a78c90a95
am:
6fe82857b5
* commit '
6fe82857b51db783a0a8c5ca48cca02ac53c9da7':
Switch some build tools to Soong
Change-Id: Ibe38c84ff0e0be64a35a8b25f07881c8ac699f33
Dan Willemsen [Mon, 6 Jun 2016 23:05:06 +0000 (23:05 +0000)]
Merge "Switch some build tools to Soong" am:
c52d09e694
am:
8a78c90a95
* commit '
8a78c90a95a3a0c5886b333e90994721eeb92734':
Switch some build tools to Soong
Change-Id: I481784785375dfb6790d14681eb110e0f67bf65c
Dan Willemsen [Mon, 6 Jun 2016 22:58:28 +0000 (22:58 +0000)]
Merge "Switch some build tools to Soong"
am:
c52d09e694
* commit '
c52d09e6944e531e02242cf971020cb2c0cf9844':
Switch some build tools to Soong
Change-Id: I4ba945cad1eda7c696cd770243e226a09ff735ac
Treehugger Robot [Mon, 6 Jun 2016 22:51:56 +0000 (22:51 +0000)]
Merge "Switch some build tools to Soong"
Alex Klyubin [Mon, 6 Jun 2016 21:58:23 +0000 (14:58 -0700)]
Fix DSA APK signatures for API Level 8 and lower.
This modifies JAR signing code to produce DSA signatures which are
accepted by all Android platforms rather than only API Level 9 and
higher.
The issue is that by default Bouncy Castle uses OID 1.2.840.10040.4.3
(dsaWithSha1) in PKCS #7 CMS SignerInfo whereas Android accepts that
only since API Level 9. However, OID 1.2.840.10040.4.1 (dsa) is
accepted by all Android platforms.
Bug:
27461702
Change-Id: I24256a255bcdc2108bdb447557af7568a2c096e3
Dan Willemsen [Mon, 6 Jun 2016 21:41:32 +0000 (14:41 -0700)]
Switch some build tools to Soong
In preparation for including them in prebuilts/build-tools.
acp: We use a prebuilt in prebuilts/sdk, but it's not part of the sdk.
ijar: We use the host libstdc++ to workaround the lack of libc++ on
some unbundled branches.
ziptime: We disable this on unbundled builds, due to the lack of libc++.
Change-Id: Ib9766b1dbddd151c38ff27c529865200ab37fce1
Dan Willemsen [Mon, 6 Jun 2016 21:47:07 +0000 (21:47 +0000)]
Merge "Remove dead rgb2565" am:
a571e83095 am:
d1f0eb15c8 am:
029da90bf4
am:
c15ad313f9
* commit '
c15ad313f9da99266fe31b9ba58b8cf4b2b92802':
Remove dead rgb2565
Change-Id: Id08762ea58df1545817df823aab86dc2fdc87277
Dan Willemsen [Mon, 6 Jun 2016 21:44:37 +0000 (21:44 +0000)]
Merge "Remove dead rgb2565" am:
a571e83095 am:
d1f0eb15c8
am:
029da90bf4
* commit '
029da90bf41604c97ccf9806f1dcf49d9cd9982c':
Remove dead rgb2565
Change-Id: Ieca7e7d6532de17c909a5a39ea44d1c665af934b
Dan Willemsen [Mon, 6 Jun 2016 21:43:16 +0000 (21:43 +0000)]
Merge "Remove dead rgb2565" am:
a571e83095
am:
d1f0eb15c8
* commit '
d1f0eb15c812b8c4ea8697b9e2171846e6510884':
Remove dead rgb2565
Change-Id: I6a95c5cf31a05822d85fce16d1e9b311dd759cee
Dan Willemsen [Mon, 6 Jun 2016 21:39:48 +0000 (21:39 +0000)]
Merge "Remove dead rgb2565"
am:
a571e83095
* commit '
a571e83095a72d595e5e4e365e0ae52aefd64356':
Remove dead rgb2565
Change-Id: I6dae3bbd804591a0e91f3467f021c5ee2dde4bf7
Dan Willemsen [Mon, 6 Jun 2016 21:37:15 +0000 (21:37 +0000)]
Merge "Drop CLANG and CLANG_CXX in the environment" am:
27a55cd3c7 am:
f03398b651 am:
ecf97649bd
am:
0da86e5198
* commit '
0da86e5198e6159ce68431d8794320c2e2ac6461':
Drop CLANG and CLANG_CXX in the environment
Change-Id: I7d84b19a01e6b2c717d8818e928ed67289ae7b63
Treehugger Robot [Mon, 6 Jun 2016 21:35:47 +0000 (21:35 +0000)]
Merge "Remove dead rgb2565"
Dan Willemsen [Mon, 6 Jun 2016 21:34:44 +0000 (21:34 +0000)]
Merge "Drop CLANG and CLANG_CXX in the environment" am:
27a55cd3c7 am:
f03398b651
am:
ecf97649bd
* commit '
ecf97649bd4ae5b2f1084874d9e809b73d9b4095':
Drop CLANG and CLANG_CXX in the environment
Change-Id: I543ce82c8d6260724551c2b51aa7ae0aeb19c3d5
Dan Willemsen [Mon, 6 Jun 2016 21:33:07 +0000 (21:33 +0000)]
Merge "Drop CLANG and CLANG_CXX in the environment" am:
27a55cd3c7
am:
f03398b651
* commit '
f03398b6519e1d9695c61da450346d5a0f0f8528':
Drop CLANG and CLANG_CXX in the environment
Change-Id: I9fce3d3c203b89295529c72de4d094ff62d178fd
Dan Willemsen [Mon, 6 Jun 2016 21:27:10 +0000 (21:27 +0000)]
Merge "Drop CLANG and CLANG_CXX in the environment"
am:
27a55cd3c7
* commit '
27a55cd3c703c190f933630e503d963ef7478183':
Drop CLANG and CLANG_CXX in the environment
Change-Id: I3850b1783fb47cda05f1a7799ff8ceddb589e033
Alex Klyubin [Mon, 6 Jun 2016 21:27:08 +0000 (21:27 +0000)]
Merge "Improve efficiency of using the DataSource abstraction." am:
7353eabd14 am:
732b29a5c3 am:
31e3dab7bb
am:
656cbe7547
* commit '
656cbe754790df9dfdbd4b8b65805e4c3fad5ba7':
Improve efficiency of using the DataSource abstraction.
Change-Id: I087e55eef64e872532e47d93d2f0d5cbd2acac74
Alex Klyubin [Mon, 6 Jun 2016 21:24:37 +0000 (21:24 +0000)]
Merge "Improve efficiency of using the DataSource abstraction." am:
7353eabd14 am:
732b29a5c3
am:
31e3dab7bb
* commit '
31e3dab7bb7dd447c1043a671668d4a3987daded':
Improve efficiency of using the DataSource abstraction.
Change-Id: I4e3719cf4283b2fa93009e68394071b0a6ce6f45
Alex Klyubin [Mon, 6 Jun 2016 21:23:05 +0000 (21:23 +0000)]
Merge "Improve efficiency of using the DataSource abstraction." am:
7353eabd14
am:
732b29a5c3
* commit '
732b29a5c38a3a33bdffea662875e6a8dab894b3':
Improve efficiency of using the DataSource abstraction.
Change-Id: I4b2e05ffc80d59ef19a1b78c3560f0d21c5b04b2
Treehugger Robot [Mon, 6 Jun 2016 21:22:57 +0000 (21:22 +0000)]
Merge "Drop CLANG and CLANG_CXX in the environment"
Alex Klyubin [Mon, 6 Jun 2016 21:17:02 +0000 (21:17 +0000)]
Merge "Improve efficiency of using the DataSource abstraction."
am:
7353eabd14
* commit '
7353eabd14cbfae2c123a58cae4ce1e770ee351d':
Improve efficiency of using the DataSource abstraction.
Change-Id: Ia1ab6c7d0b94c59ab6d7b41828e8e5d676c212e5
Alex Klyubin [Mon, 6 Jun 2016 21:07:52 +0000 (21:07 +0000)]
Merge "Improve efficiency of using the DataSource abstraction."
Dan Willemsen [Mon, 6 Jun 2016 20:32:11 +0000 (13:32 -0700)]
Remove dead rgb2565
Change-Id: I2397dc97768f24a7c416bff96dd983fc796cbb53
Dan Willemsen [Mon, 6 Jun 2016 19:21:06 +0000 (12:21 -0700)]
Drop CLANG and CLANG_CXX in the environment
We'll explicitly pass these variables to the static analyzer builds in
binary.mk
Bug:
29071982
Change-Id: Ifc7633d36f5785fe16b63f54b885396c2cab542a
Alex Klyubin [Mon, 6 Jun 2016 20:04:12 +0000 (20:04 +0000)]
Merge "Switch signapk to apksigner-core." am:
1a39e8eb34 am:
2f24b771ea am:
56d75bb19d
am:
225738f7b6
* commit '
225738f7b62f20011290aebc9f4ed966a5000522':
Switch signapk to apksigner-core.
Change-Id: Ic7b4a22c1b556111cebef82253fed3fe38bdb513
Alex Klyubin [Mon, 6 Jun 2016 20:00:21 +0000 (20:00 +0000)]
Merge "Switch signapk to apksigner-core." am:
1a39e8eb34 am:
2f24b771ea
am:
56d75bb19d
* commit '
56d75bb19d19fdc5001152d9bcd71eca01f84de6':
Switch signapk to apksigner-core.
Change-Id: Ib3b5e21aa2c45e96871b4778583aa6484594fd10
Alex Klyubin [Mon, 6 Jun 2016 19:59:12 +0000 (19:59 +0000)]
Merge "Switch signapk to apksigner-core." am:
1a39e8eb34
am:
2f24b771ea
* commit '
2f24b771eac14924ba9d5ab1a0e69da1641df582':
Switch signapk to apksigner-core.
Change-Id: I3b8ddfcf2369247713b1570cb901cc5604622c75
Alex Klyubin [Mon, 6 Jun 2016 19:52:25 +0000 (19:52 +0000)]
Merge "Switch signapk to apksigner-core."
am:
1a39e8eb34
* commit '
1a39e8eb3408f45d5f75b261fc073843ab83645b':
Switch signapk to apksigner-core.
Change-Id: I39af8650adfc9ee12f5d6256e4a2083d4f87acfb
Alex Klyubin [Mon, 6 Jun 2016 19:40:23 +0000 (19:40 +0000)]
Merge "Switch signapk to apksigner-core."
Alex Klyubin [Mon, 6 Jun 2016 18:12:50 +0000 (11:12 -0700)]
Improve efficiency of using the DataSource abstraction.
This adds getByteBuffer and copyTo methods to the DataSource
abstraction. These methods enable the client to avoid unnecessary
copying of the data source's data.
Bug:
27461702
Change-Id: If4e9f902ea75c1ca5c7be0e20c0e7218faf9c504
Ian Pedowitz [Mon, 6 Jun 2016 17:34:56 +0000 (17:34 +0000)]
Merge "resolve merge conflicts of
a87e5f8 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
am:
5131171a2e
* commit '
5131171a2eaafcd9de3ad4f8fdbabf5dc34f9304':
Change-Id: I34b6306572d034224f669963c3ffead1fe4ba18b
Ian Pedowitz [Mon, 6 Jun 2016 17:34:56 +0000 (17:34 +0000)]
resolve merge conflicts of
7a50757 to nyc-mr1-dev am:
1d2bfb274e
am:
c9d37aba6b
* commit '
c9d37aba6beaafe54a5738274de36dda419d395f':
NYC is 7.0
Change-Id: Ic6597ea9996eaccc88cf58ef379ebc9eab6be337
Ian Pedowitz [Mon, 6 Jun 2016 17:32:49 +0000 (17:32 +0000)]
Merge "resolve merge conflicts of
a87e5f8 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
Ian Pedowitz [Mon, 6 Jun 2016 17:32:32 +0000 (17:32 +0000)]
resolve merge conflicts of
7a50757 to nyc-mr1-dev
am:
1d2bfb274e
* commit '
1d2bfb274e4e62875809aeed632d865e85974b4c':
NYC is 7.0
Change-Id: I2565e7ab290eea462a1e0b32599378a95b7c4f1f
Ian Pedowitz [Mon, 6 Jun 2016 17:31:58 +0000 (10:31 -0700)]
resolve merge conflicts of
a87e5f8 to nyc-mr1-dev-plus-aosp
Change-Id: I22202dc052ba31f13bd5c6802cb5dfc9bd329ad8
Ian Pedowitz [Mon, 6 Jun 2016 17:27:28 +0000 (10:27 -0700)]
resolve merge conflicts of
7a50757 to nyc-mr1-dev
Change-Id: Ia2ef0a8289d53f9eac47e42336a1fd5f01124a57
Ian Pedowitz [Mon, 6 Jun 2016 17:13:06 +0000 (17:13 +0000)]
NYC is 7.0
am:
7a50757731
* commit '
7a5075773145704fbc08dbb08bd6e859e04e9859':
NYC is 7.0
Change-Id: Ia2d810debba042e21e34c340081369bff970db60
Ian Pedowitz [Wed, 1 Jun 2016 00:36:44 +0000 (17:36 -0700)]
NYC is 7.0
Bug:
29056633
Change-Id: Ib0186c5affd16b5223ba547b2cfff49d830dac1c
Ian Pedowitz [Mon, 6 Jun 2016 17:06:39 +0000 (10:06 -0700)]
Removing N from PLATFORM_VERSION_ALL_CODENAMES
Change-Id: I328dfa703faf2bd3232f68102d5c7f4b379df030
Fixes:
29117805
Narayan Kamath [Mon, 6 Jun 2016 16:12:30 +0000 (16:12 +0000)]
Merge "Add default values for pm.dexopt.core-app." into nyc-dev am:
da147a7c20 am:
a5c29e31d4
am:
d78fa32f2c
* commit '
d78fa32f2c05425bbb855714b9083cb1f7d2ce76':
Change-Id: I1316713d85f4519b12dea35803b9e14e6f6207ce
Narayan Kamath [Mon, 6 Jun 2016 16:11:52 +0000 (16:11 +0000)]
Merge "Add default values for pm.dexopt.core-app." into nyc-dev am:
da147a7c20 am:
8b62c008f6
am:
753ead8dbe
* commit '
753ead8dbedc4bb4e620e009be8c3608e995294c':
Add default values for pm.dexopt.core-app.
Change-Id: I038cb8ebe14cc529eae8985926bce10f9045a5d0
Narayan Kamath [Mon, 6 Jun 2016 15:46:43 +0000 (15:46 +0000)]
Merge "Add default values for pm.dexopt.core-app." into nyc-dev am:
da147a7c20
am:
a5c29e31d4
* commit '
a5c29e31d4cf8a80320e2cb0513bd4941f62eec7':
Change-Id: I76e3221877c1108fc4f2a3dc38de57d22f06a9a0
Narayan Kamath [Mon, 6 Jun 2016 15:23:22 +0000 (15:23 +0000)]
Merge "Add default values for pm.dexopt.core-app." into nyc-dev
am:
da147a7c20
* commit '
da147a7c20bf73f9b3736f6c479f3a8f3f56ab9e':
Add default values for pm.dexopt.core-app.
Change-Id: I11b1338f33e7e1bb99341e086bd6bcd7fb5f47f9
Narayan Kamath [Mon, 6 Jun 2016 15:23:22 +0000 (15:23 +0000)]
Merge "Add default values for pm.dexopt.core-app." into nyc-dev am:
da147a7c20
am:
8b62c008f6
* commit '
8b62c008f68ff3576469cd183d4ca821d4d59876':
Add default values for pm.dexopt.core-app.
Change-Id: Iae975aae9b9a3aae8ab2efbe99e0c286eb7fce0c
Narayan Kamath [Mon, 6 Jun 2016 15:15:01 +0000 (15:15 +0000)]
Merge "Add default values for pm.dexopt.core-app." into nyc-dev
am:
da147a7c20
* commit '
da147a7c20bf73f9b3736f6c479f3a8f3f56ab9e':
Add default values for pm.dexopt.core-app.
Change-Id: I566fc87539166998340617bbcc7336b5fcc691bc
Narayan Kamath [Mon, 6 Jun 2016 14:48:03 +0000 (14:48 +0000)]
Merge "Add default values for pm.dexopt.core-app." into nyc-dev
Dan Willemsen [Sat, 4 Jun 2016 01:16:55 +0000 (01:16 +0000)]
Merge "Error on external includes" am:
4b33f51043 am:
d983b78a6f am:
b25374cfe1
am:
ad3bd60374
* commit '
ad3bd603741a231e60d3d7b9ab6f9ca196888abd':
Error on external includes
Change-Id: Iea2b61d431d60c3e7e2438dcc9943d4f3c5b2d52
Dan Willemsen [Sat, 4 Jun 2016 01:14:33 +0000 (01:14 +0000)]
Merge "Error on external includes" am:
4b33f51043 am:
d983b78a6f
am:
b25374cfe1
* commit '
b25374cfe14fb8d26be5d7b5efad419ec94535e8':
Error on external includes
Change-Id: I4f16b628f88d47083df6bee05e04cc21a6d0701d
Dan Willemsen [Sat, 4 Jun 2016 01:13:07 +0000 (01:13 +0000)]
Merge "Error on external includes" am:
4b33f51043
am:
d983b78a6f
* commit '
d983b78a6fac17bbfb26d61f28510476f8edb99a':
Error on external includes
Change-Id: I82ba6748ea08cb861e3cf4f0fbade2f277433413
Dan Willemsen [Sat, 4 Jun 2016 01:09:52 +0000 (01:09 +0000)]
Merge "Error on external includes"
am:
4b33f51043
* commit '
4b33f510436f88774f5217b472835973fd8d5b2b':
Error on external includes
Change-Id: Ib2fb1470cee531cb043e7fe4a8e310fb026dcb3c
Dan Willemsen [Sat, 4 Jun 2016 01:03:20 +0000 (01:03 +0000)]
Merge "Error on external includes"
Ian Pedowitz [Fri, 3 Jun 2016 23:33:25 +0000 (23:33 +0000)]
NYC is now REL am:
f2304ce367 am:
53bf921f72
am:
dac836a39a
* commit '
dac836a39ad564a9269a8660d15fbf59b2d1128b':
Change-Id: I3bc77e8d866fcfd3df08c0ca119aeaffaf5cf49d
Ian Pedowitz [Fri, 3 Jun 2016 22:59:03 +0000 (22:59 +0000)]
NYC is now REL am:
f2304ce367
am:
53bf921f72
* commit '
53bf921f72fad270964a33007e26a614fa667844':
Change-Id: I3d465ee5a6056159d9486d41911a37cb10e3fbd7
Ian Pedowitz [Fri, 3 Jun 2016 20:00:18 +0000 (13:00 -0700)]
resolve merge conflicts of
364e42e to master
Change-Id: I0d742baa230d2d55b34de4f4a7a441dfb214d133
Ian Pedowitz [Fri, 3 Jun 2016 19:50:41 +0000 (19:50 +0000)]
resolve merge conflicts of
f2304ce to nyc-mr1-dev
am:
637c0192fc
* commit '
637c0192fcede4e91b4040bf9c486dfe1fb93d74':
NYC is now REL
Change-Id: Id0a79354dedbe45304e7d93f650878c2ba184262
Ian Pedowitz [Fri, 3 Jun 2016 19:33:43 +0000 (12:33 -0700)]
resolve merge conflicts of
f2304ce to nyc-mr1-dev
Change-Id: I0a2777aaf06ab70a1b0dfe96ff6ba6b165b0101b
Ian Pedowitz [Fri, 3 Jun 2016 19:26:30 +0000 (19:26 +0000)]
NYC is now REL
am:
f2304ce367
* commit '
f2304ce36778a95793b48fb9ccf83f6b03c19433':
NYC is now REL
Change-Id: I8d8021b1f9cf89f92b147cb29779b6295a5926d1
Ian Pedowitz [Fri, 3 Jun 2016 19:20:38 +0000 (12:20 -0700)]
resolve merge conflicts of
672cda2 to master
Change-Id: I61f4485253a1ec9dc3ef6cfa32a3930cd05da3e3
Ian Pedowitz [Fri, 3 Jun 2016 18:49:24 +0000 (18:49 +0000)]
Merge "Revert "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1""" into nyc-mr1-dev
am:
216b1ed2f5
* commit '
216b1ed2f515c4b7fb97f17a59660b0a44dcdd71':
Revert "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1""
Change-Id: I65bd31fcaf78ad40e3ac42221acfea740207e740
Ian Pedowitz [Fri, 3 Jun 2016 18:11:05 +0000 (18:11 +0000)]
Merge "Setting PLATFORM_VERSION(_CODENAME)? to O for master"
Ian Pedowitz [Fri, 3 Jun 2016 18:11:03 +0000 (18:11 +0000)]
Merge "Revert "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1""" into nyc-mr1-dev
Ian Pedowitz [Tue, 31 May 2016 22:32:31 +0000 (15:32 -0700)]
NYC is now REL
PLATFORM_VERSION_ALL_CODENAMES needs to include N for now
Bug:
28810934
Bug:
29117805
Change-Id: Ibf44e1e02077e7830d9bf92b87fb8ccae029c121
Gustav Sennton [Fri, 27 May 2016 13:07:54 +0000 (14:07 +0100)]
Add variable PRODUCT_SHIPPING_API_LEVEL.
PRODUCT_SHIPPING_API_LEVEL declares which API level a device first
shipped with.
We use this variable to set a read-only property that can be used in
CTS/GTS tests.
Bug:
26381401
Change-Id: I9dfeaf423146c35f57e69ac26c27e8a9e205bc4f
Chih-Hung Hsieh [Thu, 2 Jun 2016 23:42:26 +0000 (23:42 +0000)]
Merge "Default to enable tidy warnings in header files." am:
6a7cf55a7d am:
b764f7d0d6 am:
fbde37d8b9
am:
11aaa7034f
* commit '
11aaa7034f7914f9648a390b232621c3d0bf1f6c':
Default to enable tidy warnings in header files.
Change-Id: I093a7428b11be56bb0504c06e148b3aa1ecf1c97
Chih-Hung Hsieh [Thu, 2 Jun 2016 23:40:55 +0000 (23:40 +0000)]
Merge "Default to enable tidy warnings in header files." am:
6a7cf55a7d am:
b764f7d0d6
am:
fbde37d8b9
* commit '
fbde37d8b9c9422f97cd340bfec8283d3c7114ee':
Default to enable tidy warnings in header files.
Change-Id: Ia6077464eb29f565c79f15a9334a6cb665799ec6
Chih-Hung Hsieh [Thu, 2 Jun 2016 23:29:55 +0000 (23:29 +0000)]
Merge "Default to enable tidy warnings in header files." am:
6a7cf55a7d
am:
b764f7d0d6
* commit '
b764f7d0d662f7fd9d797ca796a85972596023d6':
Default to enable tidy warnings in header files.
Change-Id: Ied47b955b1e0d11a1711c1d76c7ef90e6394ef5a
Chih-Hung Hsieh [Thu, 2 Jun 2016 23:27:17 +0000 (23:27 +0000)]
Merge "Default to enable tidy warnings in header files."
am:
6a7cf55a7d
* commit '
6a7cf55a7dfe844b4df173520890b4daee60ea63':
Default to enable tidy warnings in header files.
Change-Id: Ib4ca529f2f81d05db8392a4f501bea3400f17d57
Treehugger Robot [Thu, 2 Jun 2016 23:17:59 +0000 (23:17 +0000)]
Merge "Default to enable tidy warnings in header files."
Tao Bao [Thu, 2 Jun 2016 23:02:30 +0000 (23:02 +0000)]
Merge "Add support for TARGET_RECOVERY_BRICK." am:
daf55776be am:
88df5bee3a am:
97b55bc7a5
am:
ba22e98c62
* commit '
ba22e98c626cab850d703a2fedde319859297f52':
Add support for TARGET_RECOVERY_BRICK.
Change-Id: Iaf1bdfb9fe86816aa14fa0a19917d7cc58de92e3
Tao Bao [Thu, 2 Jun 2016 23:00:01 +0000 (23:00 +0000)]
Merge "Add support for TARGET_RECOVERY_BRICK." am:
daf55776be am:
88df5bee3a
am:
97b55bc7a5
* commit '
97b55bc7a5b383892e90409ae35681d4bd98733d':
Add support for TARGET_RECOVERY_BRICK.
Change-Id: Ide62dee71511b4ceb38b5a8fc0d26f78db1fcbf6
Tao Bao [Thu, 2 Jun 2016 22:56:43 +0000 (22:56 +0000)]
Merge "Add support for TARGET_RECOVERY_BRICK." am:
daf55776be
am:
88df5bee3a
* commit '
88df5bee3addaacddd32adf7f78fd5fe1493c38a':
Add support for TARGET_RECOVERY_BRICK.
Change-Id: I90717df1ee18cadb89bec8afa5280b3ebf434a13
OSDN Git Service
