OSDN Git Service
Colin Cross [Fri, 13 May 2016 22:46:50 +0000 (22:46 +0000)]
Merge "Default USE_SOONG to true" am:
ac33935ac1
am:
c33da56ff3
* commit '
c33da56ff30e89f5b09ec02d0b50815b27ab833e':
Default USE_SOONG to true
Change-Id: Ib795a91a609da4402984c56a493e20dee90ec54f
Colin Cross [Fri, 13 May 2016 22:44:16 +0000 (22:44 +0000)]
Merge "Default USE_SOONG to true"
am:
ac33935ac1
* commit '
ac33935ac1721c640ce39b722cb7471ea9a5949d':
Default USE_SOONG to true
Change-Id: Ie75c39b174b20af51e13bd7f6e0dfdb50d903233
Colin Cross [Fri, 13 May 2016 22:40:23 +0000 (22:40 +0000)]
Merge "Default USE_SOONG to true"
Dan Willemsen [Fri, 13 May 2016 22:36:22 +0000 (22:36 +0000)]
Merge "Don\'t use GTEST_OS_LINUX on Darwin" am:
439f4dd189
am:
33b3051784
* commit '
33b30517846744adff51579f26a711732caaa338':
Don't use GTEST_OS_LINUX on Darwin
Change-Id: Iff14f3c4819c2b604bf0c39b69a45110fcee1fbf
Evgenii Stepanov [Fri, 13 May 2016 22:36:21 +0000 (22:36 +0000)]
Merge "Pass USE_SAFESTACK to Soong." am:
00bccf54d4
am:
5bd91e69f7
* commit '
5bd91e69f79db2cee14bd18d08f6be7720d6ff5c':
Pass USE_SAFESTACK to Soong.
Change-Id: I55b7ba71e7efdb401d5466af13895f94a3972020
Dan Willemsen [Fri, 13 May 2016 22:33:48 +0000 (22:33 +0000)]
Merge "Don\'t use GTEST_OS_LINUX on Darwin"
am:
439f4dd189
* commit '
439f4dd1895eef8684b3257fe5631a45d51635d6':
Don't use GTEST_OS_LINUX on Darwin
Change-Id: Ie05e2df72a2cbfa52d6b767cd009c36a640ef23e
Evgenii Stepanov [Fri, 13 May 2016 22:33:47 +0000 (22:33 +0000)]
Merge "Pass USE_SAFESTACK to Soong."
am:
00bccf54d4
* commit '
00bccf54d4b3847cf54f6507c8fa29eabf26f2e7':
Pass USE_SAFESTACK to Soong.
Change-Id: I9258135b2debee97b21de27232a7530780a63f5d
Dan Willemsen [Fri, 13 May 2016 22:29:16 +0000 (22:29 +0000)]
Merge "Don't use GTEST_OS_LINUX on Darwin"
Evgenii Stepanov [Fri, 13 May 2016 22:24:52 +0000 (22:24 +0000)]
Merge "Pass USE_SAFESTACK to Soong."
Evgenii Stepanov [Fri, 13 May 2016 01:03:23 +0000 (18:03 -0700)]
Pass USE_SAFESTACK to Soong.
Change-Id: I51a94da0942aa1a1e003c134a30e8da82e1270b8
Dan Willemsen [Wed, 9 Mar 2016 19:01:43 +0000 (11:01 -0800)]
Don't use GTEST_OS_LINUX on Darwin
Change-Id: If77118591daa7b474e6989e03109ea32ddd357b2
Ian Rogers [Fri, 13 May 2016 18:24:36 +0000 (18:24 +0000)]
Merge "Make Error Prone warnings in sync with Error Prone documenation." am:
86c3b72d9c
am:
f87e3bb296
* commit '
f87e3bb29664d53e3f74fecd395e12c14b7c3691':
Make Error Prone warnings in sync with Error Prone documenation.
Change-Id: Icd93fd98666f35cc936ff80db2f717ae9cacdb32
Baligh Uddin [Fri, 13 May 2016 18:21:58 +0000 (18:21 +0000)]
Merge "DO NOT MERGE Monotonic flag sets incorrectly in rangelib" into mnc-dr1.5-dev am:
b0c6b7d072 -s ours
am:
f042baf4cc
* commit '
f042baf4cc636c7d3a2a6804e3c2aa4aec6ce84a':
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
Change-Id: Ic8bee830ca8d6ffe96be82201b44d5534e4af1a3
Ian Rogers [Fri, 13 May 2016 18:21:57 +0000 (18:21 +0000)]
Merge "Make Error Prone warnings in sync with Error Prone documenation."
am:
86c3b72d9c
* commit '
86c3b72d9c9cb46acd7b8339dc3ce0a2f869fb2f':
Make Error Prone warnings in sync with Error Prone documenation.
Change-Id: I78b111feb108096a9b38c798dd4ee666a6852797
Ian Rogers [Fri, 13 May 2016 18:19:18 +0000 (18:19 +0000)]
Merge "Make Error Prone warnings in sync with Error Prone documenation."
Mohamad Ayyash [Fri, 13 May 2016 18:19:12 +0000 (18:19 +0000)]
Merge "Use fs_config files for mksquashfs" am:
4730facd73
am:
09bb85af92
* commit '
09bb85af92c075e076c566dd6e21cac3ad9b9136':
Use fs_config files for mksquashfs
Change-Id: Ida493915a4153ee7c8f3ed15293d5cf68ddfc48d
Tianjie Xu [Fri, 13 May 2016 18:18:57 +0000 (18:18 +0000)]
Merge "DO NOT MERGE Monotonic flag sets incorrectly in rangelib" into mnc-dr1.5-dev
am:
b0c6b7d072 -s ours
* commit '
b0c6b7d0722917a66aa4338e4f2b258cd221a4be':
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
Change-Id: I2b969467e56cc9c6197a181545276f75d5188bca
Mohamad Ayyash [Fri, 13 May 2016 18:16:05 +0000 (18:16 +0000)]
Merge "Use fs_config files for mksquashfs"
am:
4730facd73
* commit '
4730facd7399ead0d753d7b588001faf6469e041':
Use fs_config files for mksquashfs
Change-Id: I3c7c7c618e18598cda56f153d9ac8a988ef85510
Tianjie Xu [Fri, 13 May 2016 18:15:52 +0000 (18:15 +0000)]
DO NOT MERGE Monotonic flag sets incorrectly in rangelib am:
8d11597558 am:
8ae473d182 am:
9e337ed21c -s ours
am:
fe740bacea
* commit '
fe740baceabd28a3978388865f47dfa2acbf4f3d':
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
Change-Id: I4094c68359acb805c9cdf84cd2838f16bf6eef1c
Tianjie Xu [Fri, 13 May 2016 18:13:24 +0000 (18:13 +0000)]
DO NOT MERGE Monotonic flag sets incorrectly in rangelib am:
8d11597558 am:
8ae473d182
am:
9e337ed21c -s ours
* commit '
9e337ed21ceb8c31aaafdae67ecaa1a7c7451a47':
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
Change-Id: I810854509e0fadd4e96ccf5b69c8c17fd29f9226
Treehugger Robot [Fri, 13 May 2016 18:13:22 +0000 (18:13 +0000)]
Merge "Use fs_config files for mksquashfs"
Baligh Uddin [Fri, 13 May 2016 18:11:11 +0000 (18:11 +0000)]
Merge "DO NOT MERGE Monotonic flag sets incorrectly in rangelib" into mnc-dr1.5-dev
Tianjie Xu [Fri, 13 May 2016 18:10:55 +0000 (18:10 +0000)]
DO NOT MERGE Monotonic flag sets incorrectly in rangelib am:
8d11597558
am:
8ae473d182
* commit '
8ae473d18280e25d010c040147393a3b1e3bbc75':
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
Change-Id: Ibbed631ec32f00f026bdcf4af8a9a1213d87b4e5
Tianjie Xu [Fri, 13 May 2016 18:08:12 +0000 (18:08 +0000)]
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
am:
8d11597558
* commit '
8d1159755849ffcc1bd5c0de2821a4f5fe4ea58d':
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
Change-Id: Ie0180bab1d41d86d3d2c3f14501b51b50f74635e
Tianjie Xu [Fri, 8 Apr 2016 03:17:48 +0000 (20:17 -0700)]
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
After applying update_target_files_incr_ext4.sh, some files may end up
occupying unsorted block fragments. In one example, an apk file has the
block range [258768-259211,196604]. The monotonic flag in rangelib sets
incorrectly for this example and leads to a bad input file for imgdiff.
After fixing the flag, bsdiff is called instead of imgdiff and the
incremental OTA package generates successfully.
Bug:
28760775
Bug:
28053885
Change-Id: Ib841bf449ff6a29314fc4a1b8fba941a6dc532ac
(cherry picked from commit
cd1e16a7616092e5a315b0a421a0c082da144145)
(cherry picked from commit
8d1159755849ffcc1bd5c0de2821a4f5fe4ea58d)
Tianjie Xu [Fri, 8 Apr 2016 03:17:48 +0000 (20:17 -0700)]
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
After applying update_target_files_incr_ext4.sh, some files may end up
occupying unsorted block fragments. In one example, an apk file has the
block range [258768-259211,196604]. The monotonic flag in rangelib sets
incorrectly for this example and leads to a bad input file for imgdiff.
After fixing the flag, bsdiff is called instead of imgdiff and the
incremental OTA package generates successfully.
Bug:
28760775
Bug:
28053885
Change-Id: Ib841bf449ff6a29314fc4a1b8fba941a6dc532ac
(cherry picked from commit
cd1e16a7616092e5a315b0a421a0c082da144145)
Ian Rogers [Fri, 13 May 2016 15:59:00 +0000 (08:59 -0700)]
Make Error Prone warnings in sync with Error Prone documenation.
Use summary information from annotation within Error Prone to auto-generate
the warnings list.
Bug:
28681096
Change-Id: Ib3a5f734bd229726fcd7332eaa9e0e1bd1200c25
Shinichiro Hamaji [Fri, 13 May 2016 05:33:09 +0000 (14:33 +0900)]
resolve merge conflicts of
505f1ea to nyc-dev-plus-aosp
Change-Id: I023ace4df452371eea1b0b004d8817e6fe90585e
Shinichiro Hamaji [Fri, 13 May 2016 05:24:35 +0000 (05:24 +0000)]
Merge "Follow symlinks when using find for assets"
am:
4c4c06016b
* commit '
4c4c06016bfe62fde1aaf2fff33d6f6c55f78b89':
Follow symlinks when using find for assets
Change-Id: I62fc48be86bbbac6e0d2f09e398a4922fe21668a
Shinichiro Hamaji [Fri, 13 May 2016 05:20:05 +0000 (05:20 +0000)]
Merge "Follow symlinks when using find for assets"
Mohamad Ayyash [Fri, 8 Apr 2016 05:10:51 +0000 (22:10 -0700)]
Use fs_config files for mksquashfs
BUG:
27467028
Change-Id: I7648030ad4b31d70a5d439e9552fd2cbfe288b74
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
BUG:
28704419
Dan Willemsen [Fri, 13 May 2016 01:43:09 +0000 (01:43 +0000)]
Merge "Read Soong-exported configuration" am:
c7b610a67e
am:
bcbba61a25
* commit '
bcbba61a2500da9c51690ef8956e15020e9f6fea':
Read Soong-exported configuration
Change-Id: Ia23208e26bae53bd74bb77b0a0ebbe63ac6f8a9c
Dan Willemsen [Fri, 13 May 2016 01:40:48 +0000 (01:40 +0000)]
Merge "Read Soong-exported configuration"
am:
c7b610a67e
* commit '
c7b610a67ebff333cede41d5f336165485c9ae5d':
Read Soong-exported configuration
Change-Id: I0890077c980e0e9d863809bc02fbb8e2f5aa8018
Dan Willemsen [Fri, 13 May 2016 01:36:28 +0000 (01:36 +0000)]
Merge "Read Soong-exported configuration"
Baligh Uddin [Thu, 12 May 2016 23:22:24 +0000 (23:22 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours am:
d28e7ea333 -s ours am:
e038da17f3 -s ours am:
e3b631a5d6 -s ours am:
7e806813bb -s ours am:
e20dd6dca2 -s ours am:
63847c39a6 -s ours
am:
53380a8386 -s ours
* commit '
53380a8386b977c8117d0030d65a1f004822ac11':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I2f922b9e4551849017b6523eb2c8c640870f8b64
Baligh Uddin [Thu, 12 May 2016 23:19:56 +0000 (23:19 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours am:
d28e7ea333 -s ours am:
e038da17f3 -s ours am:
e3b631a5d6 -s ours am:
7e806813bb -s ours am:
e20dd6dca2 -s ours
am:
63847c39a6 -s ours
* commit '
63847c39a64e7ab0a5e8564d887864c02a7ba2a5':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I289fc7b1d9ef94d6a298cfbd64ee6f66e8790b64
Baligh Uddin [Thu, 12 May 2016 23:17:37 +0000 (23:17 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours am:
d28e7ea333 -s ours am:
e038da17f3 -s ours am:
e3b631a5d6 -s ours am:
7e806813bb -s ours
am:
e20dd6dca2 -s ours
* commit '
e20dd6dca20231b7e68f3a8874bccedc1e56c40f':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I7391006c948be8188b8b197c1e318b76a826155a
Baligh Uddin [Thu, 12 May 2016 23:15:18 +0000 (23:15 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours am:
d28e7ea333 -s ours am:
e038da17f3 -s ours am:
e3b631a5d6 -s ours
am:
7e806813bb -s ours
* commit '
7e806813bb0c3df85c69aaa78a21d0d5dac7e92b':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: Ic99ba9bb2041840402829b1d2e75684bfbeb66f2
Baligh Uddin [Thu, 12 May 2016 23:12:59 +0000 (23:12 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours am:
d28e7ea333 -s ours am:
e038da17f3 -s ours
am:
e3b631a5d6 -s ours
* commit '
e3b631a5d62923a381bf0ecb151a1ec9c584380c':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I7f17e328de62c50087bc6d2acf3d8c17f5fb541f
Baligh Uddin [Thu, 12 May 2016 23:10:35 +0000 (23:10 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours am:
d28e7ea333 -s ours
am:
e038da17f3 -s ours
* commit '
e038da17f38eac01e6c971d9f5956ea701a341e2':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: Ice12c95006ab0b10fa2d2a6413925001249564d8
Baligh Uddin [Thu, 12 May 2016 23:08:02 +0000 (23:08 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours
am:
d28e7ea333 -s ours
* commit '
d28e7ea333986fe820f19f2b34dec074f3b8bc22':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I65fd87879662e05d3906d530d5cba3e0d313990c
Baligh Uddin [Thu, 12 May 2016 23:05:19 +0000 (23:05 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
am:
f193546d65 -s ours
* commit '
f193546d65d41d40bd0e24e9bfe443001a320d1a':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I3fe077a1b75e67963cfbcc7430912afd5143d418
Baligh Uddin [Thu, 12 May 2016 22:55:26 +0000 (15:55 -0700)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Bug:
23967152
Change-Id: I2e2f1ead28f51f549dafacfc7d1d1e65b0b84bc7
Dan Willemsen [Thu, 12 May 2016 20:46:28 +0000 (20:46 +0000)]
Merge "Use product-specific Soong outputs" am:
f100d01dd5
am:
f8c5eac739
* commit '
f8c5eac739399522fffe3521f9d782aecfa6ca48':
Use product-specific Soong outputs
Change-Id: I559504dc7338f19c0dd4776495b3f27c8b0a7cd6
Dan Willemsen [Thu, 12 May 2016 20:43:47 +0000 (20:43 +0000)]
Merge "Use product-specific Soong outputs"
am:
f100d01dd5
* commit '
f100d01dd5dde712a19bd75f8f6895b21641bd62':
Use product-specific Soong outputs
Change-Id: I530778730be7424be3d3fbe88fd65fc70d2a0d12
Dan Willemsen [Tue, 29 Mar 2016 19:32:16 +0000 (12:32 -0700)]
Read Soong-exported configuration
This is to ensure that Make and Soong agree on configuration variables
like TARGET_GLOBAL_CFLAGS. Only a few variables are actually checked
currently until we make more actually the same.
Bug:
23566674
Change-Id: Ibede43d933ede4d470e182f9490ea6ec4ef52fbc
Dan Willemsen [Thu, 12 May 2016 20:33:05 +0000 (20:33 +0000)]
Merge "Use product-specific Soong outputs"
Ian Pedowitz [Thu, 12 May 2016 19:01:17 +0000 (19:01 +0000)]
Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev
am:
77df46efec
* commit '
77df46efec7996325cbdb17b67bcecbbe88bfa6b':
PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4
Change-Id: I463332a4a8e3113749de2a0179c086f45a07c7a3
Ian Pedowitz [Thu, 12 May 2016 18:58:17 +0000 (18:58 +0000)]
Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev
Alex Klyubin [Thu, 12 May 2016 18:48:30 +0000 (18:48 +0000)]
Merge "Offer an ApkSignerEngine implementation." am:
6975f03fd8
am:
2c7da1d5c7
* commit '
2c7da1d5c7b5c41736b8f0d63530344ce5f691e7':
Offer an ApkSignerEngine implementation.
Change-Id: I6e8f9205476ae95bf65f3a6c3d0c0653a8546ffe
Alex Klyubin [Thu, 12 May 2016 18:45:58 +0000 (18:45 +0000)]
Merge "Offer an ApkSignerEngine implementation."
am:
6975f03fd8
* commit '
6975f03fd8b65c294a08ebc40be7da871e9e74d7':
Offer an ApkSignerEngine implementation.
Change-Id: I7ab04e1e9699219bb5204c2b656b47583a399e31
Alex Klyubin [Thu, 12 May 2016 18:43:08 +0000 (18:43 +0000)]
Merge "Offer an ApkSignerEngine implementation."
Amanda Kassay [Thu, 12 May 2016 18:35:34 +0000 (18:35 +0000)]
Removing commented out deprecated download links in sdkpage.cs am:
eefc7d441c am:
7387b5861b am:
494e80cabc
am:
b6a7250084
* commit '
b6a7250084c5616bd0f16e50bf6aba402a552d87':
Removing commented out deprecated download links in sdkpage.cs
Change-Id: I0cb3a9d072c4239e07869ef3d6e1086eb25b55d4
Amanda Kassay [Thu, 12 May 2016 18:32:29 +0000 (18:32 +0000)]
Removing commented out deprecated download links in sdkpage.cs am:
eefc7d441c am:
7387b5861b
am:
494e80cabc
* commit '
494e80cabcec97f4052ca15bd1eb8968e7910c35':
Removing commented out deprecated download links in sdkpage.cs
Change-Id: I332c0b7c12686e868fe24404aecc8966cdcf6f5d
Amanda Kassay [Thu, 12 May 2016 18:29:57 +0000 (18:29 +0000)]
Removing commented out deprecated download links in sdkpage.cs am:
eefc7d441c
am:
7387b5861b
* commit '
7387b5861b61d22a0c2edffb10611284a6d8fa0b':
Removing commented out deprecated download links in sdkpage.cs
Change-Id: I40bb1b50cc1d49dd3113e8511b8fa744acdf27b5
Amanda Kassay [Thu, 12 May 2016 18:27:28 +0000 (18:27 +0000)]
Removing commented out deprecated download links in sdkpage.cs
am:
eefc7d441c
* commit '
eefc7d441c2c3b235fdae71853921dffff6da755':
Removing commented out deprecated download links in sdkpage.cs
Change-Id: I95145f9fb614fc875fcffbccfa24f176160138f7
Amanda Kassay [Thu, 12 May 2016 18:17:41 +0000 (14:17 -0400)]
Removing commented out deprecated download links in sdkpage.cs
Change-Id: Iad26e72120b110fa017821be887de0cd07b3889a
Alex Klyubin [Wed, 11 May 2016 19:48:27 +0000 (12:48 -0700)]
Offer an ApkSignerEngine implementation.
This adds an implementation of ApkSignerEngine to the apksigner-core
library.
Bug:
27461702
Change-Id: I5f977b98555ca507a0dfcd3e92eecb9758aa8370
Ian Pedowitz [Thu, 12 May 2016 17:39:59 +0000 (10:39 -0700)]
PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4
Bug:
27150977
Change-Id: I0958ee2cc377c5640c616dab8f093323ffd76c29
Shinichiro Hamaji [Thu, 12 May 2016 09:15:28 +0000 (18:15 +0900)]
Follow symlinks when using find for assets
This should have been done in
https://android-review.googlesource.com/#/c/43901/
Bug:
27954979
Change-Id: I663b5e87e0d844d37a59e404219ff5e7e364df74
Joe Fernandez [Thu, 12 May 2016 06:37:21 +0000 (06:37 +0000)]
docs: Wear Preview - TOC and Resource card fixes for DoDS am:
151592490e am:
10719438d6
am:
5b61e4cb61
* commit '
5b61e4cb6109bf2435f9231f3c0d0368ab912599':
docs: Wear Preview - TOC and Resource card fixes for DoDS
Change-Id: Ifac77b8621bebf82a3ea2121878bdce15fce46a1
Joe Fernandez [Thu, 12 May 2016 06:34:58 +0000 (06:34 +0000)]
docs: Wear Preview - TOC and Resource card fixes for DoDS am:
151592490e
am:
10719438d6
* commit '
10719438d6faaa1fea500057e211b2d88faf6d74':
docs: Wear Preview - TOC and Resource card fixes for DoDS
Change-Id: If17971766425bc5fbba0e9860d611ea043d6b8dd
Joe Fernandez [Thu, 12 May 2016 06:32:49 +0000 (06:32 +0000)]
docs: Wear Preview - TOC and Resource card fixes for DoDS
am:
151592490e
* commit '
151592490e22253eeb5355bd2861c56c80ecf437':
docs: Wear Preview - TOC and Resource card fixes for DoDS
Change-Id: I2e8521069969baaa1696adbef2f4cb901b636fb9
Joe Fernandez [Thu, 12 May 2016 02:43:25 +0000 (19:43 -0700)]
docs: Wear Preview - TOC and Resource card fixes for DoDS
b/
28004352
Change-Id: Iff222f71508c21e0b35a3d41c846c062755605cd
Shinichiro Hamaji [Thu, 12 May 2016 02:23:45 +0000 (02:23 +0000)]
Merge "Correct some dependencies around zip packages" am:
b6f2c8fac8
am:
eac63ed087
* commit '
eac63ed087e7e84a80ddc6c45d2f21bfae5617b0':
Correct some dependencies around zip packages
Change-Id: I783119bdce2044473c96c680cd035d131604dc94
Shinichiro Hamaji [Thu, 12 May 2016 02:20:36 +0000 (02:20 +0000)]
Merge "Correct some dependencies around zip packages"
am:
b6f2c8fac8
* commit '
b6f2c8fac8246ed7e6a1d25bf9cc0e658504813a':
Correct some dependencies around zip packages
Change-Id: I59e2597e955e69a35edbd0fa13bb1eb4d076b456
Shinichiro Hamaji [Thu, 12 May 2016 02:06:42 +0000 (02:06 +0000)]
Merge "Correct some dependencies around zip packages"
Baligh Uddin [Thu, 12 May 2016 00:13:32 +0000 (00:13 +0000)]
DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip. am:
16690162c3 -s ours am:
1ae509ad7b -s ours
am:
1e516a7ecf -s ours
* commit '
1e516a7ecf00d31017dd00ec49570025f7241dfe':
DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.
Change-Id: Ib4ed89153a7566542075040de97ecdc60812b6d7
Baligh Uddin [Wed, 11 May 2016 23:42:40 +0000 (23:42 +0000)]
DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip. am:
16690162c3 -s ours
am:
1ae509ad7b -s ours
* commit '
1ae509ad7bd3efaea1e66292f25faa63d27e756d':
DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.
Change-Id: I9bebf65953a49a48bfd17373d6fd4bc749a9e764
Baligh Uddin [Wed, 11 May 2016 23:39:21 +0000 (23:39 +0000)]
DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.
am:
16690162c3 -s ours
* commit '
16690162c3eac9a40824c400822cb7023414a75b':
DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.
Change-Id: I299c80c92c58cd11f7f7914942728956c896cf50
Baligh Uddin [Wed, 11 May 2016 23:30:50 +0000 (16:30 -0700)]
DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.
This is needed for nemo* signing off emerald-dev.
Bug:
28726512
Wei Wang [Wed, 11 May 2016 22:03:31 +0000 (22:03 +0000)]
Merge "Include BRILLO_VENDOR_PARTITIONS in target zip generation" am:
648ea82b04
am:
a22d0a88ba
* commit '
a22d0a88ba74bba43a8683e542b5f46eb9afce22':
Include BRILLO_VENDOR_PARTITIONS in target zip generation
Change-Id: I44390a1512b24880183d40d35087409b9693435f
Chih-Hung Hsieh [Wed, 11 May 2016 22:03:21 +0000 (22:03 +0000)]
Merge "Add misc-macro-parentheses to default tidy checks." am:
a55b7ec4c3
am:
16af95b4a5
* commit '
16af95b4a5dc425ec59f58608d3a4547c522b278':
Add misc-macro-parentheses to default tidy checks.
Change-Id: Ia5b7b958cc0c788790a4327e0dba707179e39fb7
Wei Wang [Wed, 11 May 2016 21:57:08 +0000 (21:57 +0000)]
Merge "Include BRILLO_VENDOR_PARTITIONS in target zip generation"
am:
648ea82b04
* commit '
648ea82b048a83dfcc68aa3419523502b3a1485f':
Include BRILLO_VENDOR_PARTITIONS in target zip generation
Change-Id: I9aa55d82d8121b66dd853cf434b2a68b4dbbab68
Chih-Hung Hsieh [Wed, 11 May 2016 21:57:03 +0000 (21:57 +0000)]
Merge "Add misc-macro-parentheses to default tidy checks."
am:
a55b7ec4c3
* commit '
a55b7ec4c38f5de172d51e805215505196c7702d':
Add misc-macro-parentheses to default tidy checks.
Change-Id: I2e93d50500ee3c6746aa805f0f6b268c07687c7f
Alex Klyubin [Wed, 11 May 2016 21:56:43 +0000 (21:56 +0000)]
Fix handling of version codes in minSdkVersion when signing.
am:
f59ad14c1f
* commit '
f59ad14c1f7cb07a4669741f8b0bb1e938398eca':
Fix handling of version codes in minSdkVersion when signing.
Change-Id: Ie53be2528b32bc2eaa70645000ad66473422e06f
Treehugger Robot [Wed, 11 May 2016 21:49:56 +0000 (21:49 +0000)]
Merge "Include BRILLO_VENDOR_PARTITIONS in target zip generation"
Treehugger Robot [Wed, 11 May 2016 21:44:20 +0000 (21:44 +0000)]
Merge "Add misc-macro-parentheses to default tidy checks."
Chih-Hung Hsieh [Wed, 11 May 2016 20:44:51 +0000 (20:44 +0000)]
Merge "Fix misc-macro-parentheses warnings." am:
bc0ab6d133
am:
a2c8976011
* commit '
a2c8976011dd06cac9b05bc7a94927253d4fc1c2':
Fix misc-macro-parentheses warnings.
Change-Id: Ie8145f33e854171e22e7a1f63400bcfe600101b8
Chih-Hung Hsieh [Wed, 11 May 2016 20:39:48 +0000 (13:39 -0700)]
Add misc-macro-parentheses to default tidy checks.
* Disable this check in external projects.
Bug:
28705665
Change-Id: Ia44a15765fd637dae36b5e0f2b59ee4280b139c9
Chih-Hung Hsieh [Wed, 11 May 2016 20:39:19 +0000 (20:39 +0000)]
Merge "Fix misc-macro-parentheses warnings."
am:
bc0ab6d133
* commit '
bc0ab6d1337802a52d2ba07897d58085f128857d':
Fix misc-macro-parentheses warnings.
Change-Id: I3b3d4d2cdcc9e26bdf8cf6cb8586f333421a2a81
Chih-hung Hsieh [Wed, 11 May 2016 20:30:47 +0000 (20:30 +0000)]
Merge "Fix misc-macro-parentheses warnings."
Wei Wang [Wed, 11 May 2016 05:48:13 +0000 (22:48 -0700)]
Include BRILLO_VENDOR_PARTITIONS in target zip generation
This change will enable the target zip to include partition defined in
BRILLO_VENDOR_PARTITIONS. This is necessary for OTA to support
partitions other than boot and system in ab_partitions.txt.
The target zip will include images in BRILLO_VENDOR_PARTITIONS if
defined, under VENDOR_IMAGES/ with path kept. Also any vendor partitions
defined in AB_OTA_PARTITIONS will be copied to IMAGES/ in the target zip.
BUG:
28623063
Change-Id: Ic479048dfb8ac506acf827865e784fcb0432a1d5
Ian Rogers [Wed, 11 May 2016 19:22:23 +0000 (19:22 +0000)]
Merge "Add code search links to warnings." am:
adf2141b66
am:
086e70d0c9
* commit '
086e70d0c950d8ccd5d8ed995c6aa8c9de72ae2d':
Add code search links to warnings.
Change-Id: I1262ab7d091878c4424789689be3728510c75b0a
Ian Rogers [Wed, 11 May 2016 19:16:31 +0000 (19:16 +0000)]
Merge "Add code search links to warnings."
am:
adf2141b66
* commit '
adf2141b665ed2329c5f417acbaba56adb8d2240':
Add code search links to warnings.
Change-Id: I249d561788480a2cb0cb532a00cb95bd478fbe2a
Alex Klyubin [Wed, 11 May 2016 19:11:11 +0000 (12:11 -0700)]
Fix handling of version codes in minSdkVersion when signing.
The APK signing tool, build/tools/signapk, needs to know the API Level
of the oldest platform supported by the APK. The APK's minSdkVersion
may reference that using a number (API Level) or a version code. To
handle the version code case, the existing logic was to see if it
matches $PLATFORM_VERSION_CODENAME and then substitute it with
$PLATFORM_SDK_VERSION.
However, some platforms support multiple version codes. To handle this
scenario, this commit changes the logic for computing the min API
Level for signing purposes to treat any non-numeric minSdkVersion as
$PLATFORM_SDK_VERSION.
Bug:
28715556
Change-Id: I292c96e8928b7e2f8d9716ef2be33a23a87764c4
Ian Rogers [Wed, 11 May 2016 19:07:36 +0000 (19:07 +0000)]
Merge "Add code search links to warnings."
Chih-Hung Hsieh [Wed, 11 May 2016 18:55:33 +0000 (11:55 -0700)]
Fix misc-macro-parentheses warnings.
Add parentheses around macro arguments used beside binary operators.
Bug:
28705665
Change-Id: I8594b9463e2389a46d6e0235757b93de065cd007
Scott Main [Wed, 11 May 2016 17:52:19 +0000 (17:52 +0000)]
Merge "remove silly css hack that\'s no longer needed in the new site design, but which now actually causes layout problems." into mnc-mr-docs am:
547111f16c am:
1db6c2f315 am:
9594b9991f
am:
aae9e8b623
* commit '
aae9e8b6235ef2a57c866052b2ced7b0a1204d49':
remove silly css hack that's no longer needed in the new site design, but which now actually causes layout problems.
Change-Id: I008231034b060956657f91cb397511af912d1f8e
smain@google.com [Wed, 11 May 2016 17:43:36 +0000 (17:43 +0000)]
Merge "remove silly css hack that\'s no longer needed in the new site design, but which now actually causes layout problems." into mnc-mr-docs am:
547111f16c am:
1db6c2f315
am:
9594b9991f
* commit '
9594b9991f78e9891b530eccdb5c72c0e7343c75':
remove silly css hack that's no longer needed in the new site design, but which now actually causes layout problems.
Change-Id: I91789079b83a42ab562bf1be84c6313c47185d3a
Dirk Dougherty [Wed, 11 May 2016 17:40:37 +0000 (17:40 +0000)]
Custom data names for reference extensions. am:
ceb4a59409 am:
c72ec756c2 am:
a890553c51
am:
03d6d05559
* commit '
03d6d05559bb9b9ea5e4192828296bc4a7faabef':
Custom data names for reference extensions.
Change-Id: I8d946ea60637e5a5716886f3fa33c136dd71050d
Scott Main [Wed, 11 May 2016 17:40:36 +0000 (17:40 +0000)]
Merge "remove silly css hack that\'s no longer needed in the new site design, but which now actually causes layout problems." into mnc-mr-docs am:
547111f16c
am:
1db6c2f315
* commit '
1db6c2f315c5bb4068325eb2f431a36c8d3c14ba':
remove silly css hack that's no longer needed in the new site design, but which now actually causes layout problems.
Change-Id: I050f42c42fd200ce4b6613945ffdc3a92f9fd0a9
Dirk Dougherty [Wed, 11 May 2016 17:37:46 +0000 (17:37 +0000)]
Custom data names for reference extensions. am:
ceb4a59409 am:
c72ec756c2
am:
a890553c51
* commit '
a890553c5137284a136f9391db78a0a2aa527c18':
Custom data names for reference extensions.
Change-Id: I5cb49898b977dbabba014aff5c45f5d902d719c1
smain@google.com [Wed, 11 May 2016 17:37:45 +0000 (17:37 +0000)]
Merge "remove silly css hack that\'s no longer needed in the new site design, but which now actually causes layout problems." into mnc-mr-docs
am:
547111f16c
* commit '
547111f16c6ee7418a20a9ef1f4e7d34e524d440':
remove silly css hack that's no longer needed in the new site design, but which now actually causes layout problems.
Change-Id: I4256cbf5f4cfe5187d7f5b58d7c0315c9d89ca27
Dirk Dougherty [Wed, 11 May 2016 17:34:56 +0000 (17:34 +0000)]
Custom data names for reference extensions. am:
ceb4a59409
am:
c72ec756c2
* commit '
c72ec756c27ccd0cde5e80a7242d3809398be19d':
Custom data names for reference extensions.
Change-Id: If1ac0af6c4f0a78295fec643e5c1352f2597271b
Scott Main [Wed, 11 May 2016 17:34:29 +0000 (17:34 +0000)]
Merge "remove silly css hack that's no longer needed in the new site design, but which now actually causes layout problems." into mnc-mr-docs
Dirk Dougherty [Wed, 11 May 2016 17:32:16 +0000 (17:32 +0000)]
Custom data names for reference extensions.
am:
ceb4a59409
* commit '
ceb4a5940959248284af443971d831f8be5d1312':
Custom data names for reference extensions.
Change-Id: Ic3ffd1044067e3328709441234621c0e62677a13
smain@google.com [Wed, 11 May 2016 17:16:56 +0000 (10:16 -0700)]
remove silly css hack that's no longer needed in the new site design,
but which now actually causes layout problems.
Change-Id: I27859f6103ea0538442b22cd67b64d970d831d93
Shinichiro Hamaji [Tue, 10 May 2016 07:40:38 +0000 (16:40 +0900)]
Correct some dependencies around zip packages
Add scripts which creates these packages to their dependencies.
$(SYMBOLS_ZIP) contains symbol info of the updater binary so
it should depend on it.
Bug:
27954979
Change-Id: If78746ec843dd57fe5fdda3ed504a12bb298ea1d
Tao Bao [Wed, 11 May 2016 15:21:28 +0000 (15:21 +0000)]
Merge "Revert "Include vendor partitions in target zip generation"" am:
7ff7c2d870
am:
b1963b65a4
* commit '
b1963b65a45ddef3159b542ee49d82a6c310f1d4':
Revert "Include vendor partitions in target zip generation"
Change-Id: I468caee113cba2b51ca225a9d8de8b791ed502fd
OSDN Git Service
