OSDN Git Service
Zach Jang [Fri, 18 Mar 2016 00:11:47 +0000 (17:11 -0700)]
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2
- kernel updates with patches for CVE-2015-1805
b/
27724967
Change-Id: Ie9daf35dcba3f844c925358daf2646b7ab5b5f5f
Fix merge conflict to mnc-mr2-release w/ security string change to 2016-04-02
The Android Automerger [Thu, 17 Mar 2016 02:47:23 +0000 (19:47 -0700)]
MOB30C
The Android Automerger [Wed, 2 Mar 2016 03:15:31 +0000 (19:15 -0800)]
MOB30B
The Android Automerger [Sat, 27 Feb 2016 00:56:25 +0000 (16:56 -0800)]
"MOB29Z"
Zach Jang [Fri, 19 Feb 2016 21:50:29 +0000 (13:50 -0800)]
Updating security string patch to 2016-04-01
b/
27272697
Change-Id: I99c2c892a21f4c36226ea5f8d94689d6218ccf7e
The Android Automerger [Thu, 25 Feb 2016 03:56:31 +0000 (19:56 -0800)]
MOB29Y
The Android Automerger [Wed, 24 Feb 2016 21:21:39 +0000 (13:21 -0800)]
"MOB29X"
The Android Automerger [Tue, 16 Feb 2016 20:28:52 +0000 (12:28 -0800)]
"MOB29W"
The Android Automerger [Fri, 22 Jan 2016 21:43:14 +0000 (13:43 -0800)]
"MMB29V"
Zach Jang [Tue, 12 Jan 2016 01:12:37 +0000 (17:12 -0800)]
Updating security patch string to 2016-03-01
b/
26499556
Change-Id: I18a5ad9d8d08e2050053bcebc1a9a0c46db86733
The Android Automerger [Thu, 17 Dec 2015 21:15:30 +0000 (13:15 -0800)]
"MMB29U"
The Android Automerger [Thu, 17 Dec 2015 21:08:32 +0000 (13:08 -0800)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Wed, 16 Dec 2015 20:07:39 +0000 (12:07 -0800)]
"MMB29T"
The Android Automerger [Tue, 15 Dec 2015 21:31:36 +0000 (13:31 -0800)]
"MMB29S"
The Android Automerger [Tue, 15 Dec 2015 21:24:12 +0000 (13:24 -0800)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Tue, 15 Dec 2015 20:55:01 +0000 (12:55 -0800)]
"MMB76"
The Android Automerger [Tue, 15 Dec 2015 20:54:55 +0000 (12:54 -0800)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Fri, 11 Dec 2015 18:27:49 +0000 (10:27 -0800)]
"MMB29R"
The Android Automerger [Fri, 11 Dec 2015 00:11:59 +0000 (16:11 -0800)]
"MMB29Q"
Zach Jang [Wed, 9 Dec 2015 20:46:59 +0000 (12:46 -0800)]
Update Security String to 2016-02-01
b/
26110717
Change-Id: I1085f5d053b07c6c81d2ef22fbba5ab9157a67f2
The Android Automerger [Tue, 8 Dec 2015 20:35:29 +0000 (12:35 -0800)]
MMN29P
The Android Automerger [Wed, 2 Dec 2015 01:42:01 +0000 (17:42 -0800)]
"MMB29O"
Zach Jang [Fri, 20 Nov 2015 22:37:14 +0000 (14:37 -0800)]
Update Security String to 2016-01-01 to mnc-dev
http://b/
25819582
Change-Id: Ie55f9476110b08591da05774f582a6e48ce12de7
Bart Sears [Sun, 15 Nov 2015 17:57:13 +0000 (17:57 +0000)]
Revert "Change version back to 6.0"
This reverts commit
970f203b3d3f17b778749c3ce47eb6b922aa606c.
Change-Id: Icd96990f128e303b0e2af5af0f0d4a0f7731fe60
Bart Sears [Sun, 15 Nov 2015 07:50:18 +0000 (23:50 -0800)]
Change version back to 6.0
Temporarily set the version back to 6.0 and security patch to
2015-11-01.
Change-Id: Idb09d6bab89362b18ae9657e3ed931d614c1894b
The Android Automerger [Thu, 19 Nov 2015 00:31:30 +0000 (16:31 -0800)]
MMB29N
The Android Automerger [Tue, 17 Nov 2015 18:58:18 +0000 (10:58 -0800)]
"MMB29M"
Bart Sears [Sun, 15 Nov 2015 17:57:13 +0000 (17:57 +0000)]
Revert "Change version back to 6.0"
This reverts commit
970f203b3d3f17b778749c3ce47eb6b922aa606c.
Change-Id: Icd96990f128e303b0e2af5af0f0d4a0f7731fe60
The Android Automerger [Sun, 15 Nov 2015 19:11:16 +0000 (11:11 -0800)]
"MMB29L"
Bart Sears [Sun, 15 Nov 2015 07:50:18 +0000 (23:50 -0800)]
Change version back to 6.0
Temporarily set the version back to 6.0 and security patch to
2015-11-01.
Change-Id: Idb09d6bab89362b18ae9657e3ed931d614c1894b
The Android Automerger [Wed, 11 Nov 2015 22:03:07 +0000 (14:03 -0800)]
"MMB29K"
The Android Automerger [Tue, 10 Nov 2015 04:11:33 +0000 (20:11 -0800)]
"MMB29J"
The Android Automerger [Tue, 10 Nov 2015 01:01:28 +0000 (17:01 -0800)]
"MMB29I"
The Android Automerger [Fri, 6 Nov 2015 03:24:05 +0000 (19:24 -0800)]
"MMB29H"
The Android Automerger [Fri, 6 Nov 2015 01:35:30 +0000 (17:35 -0800)]
"MMB29G"
The Android Automerger [Thu, 5 Nov 2015 01:03:11 +0000 (17:03 -0800)]
"MMB29F"
The Android Automerger [Wed, 4 Nov 2015 21:00:25 +0000 (13:00 -0800)]
"MMB29E"
The Android Automerger [Tue, 3 Nov 2015 22:35:42 +0000 (14:35 -0800)]
"MMB29D"
The Android Automerger [Mon, 2 Nov 2015 21:21:41 +0000 (13:21 -0800)]
"MMB29C"
The Android Automerger [Fri, 30 Oct 2015 02:25:14 +0000 (19:25 -0700)]
"MMB29B"
The Android Automerger [Thu, 29 Oct 2015 08:01:32 +0000 (01:01 -0700)]
"MMB29"
The Android Automerger [Thu, 29 Oct 2015 08:00:16 +0000 (01:00 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Thu, 29 Oct 2015 01:31:03 +0000 (18:31 -0700)]
bump version to MMB28B
The Android Automerger [Wed, 28 Oct 2015 08:02:09 +0000 (01:02 -0700)]
"MMB28"
The Android Automerger [Wed, 28 Oct 2015 08:00:19 +0000 (01:00 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Tue, 27 Oct 2015 08:01:43 +0000 (01:01 -0700)]
"MMB27"
The Android Automerger [Tue, 27 Oct 2015 08:00:33 +0000 (01:00 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
Zach Jang [Tue, 27 Oct 2015 00:44:56 +0000 (00:44 +0000)]
Merge "Update security string to 2015-12-01" into mnc-dev
am:
54cb940c4a
* commit '
54cb940c4a07701212e96f77ee4a89493b0f251b':
Update security string to 2015-12-01
Zach Jang [Tue, 27 Oct 2015 00:37:40 +0000 (00:37 +0000)]
Merge "Update security string to 2015-12-01" into mnc-dev
Zach Jang [Mon, 26 Oct 2015 23:52:50 +0000 (23:52 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8 am:
cc9ac27157 am:
fe64ce145e -s ours
am:
0e8cf97670
* commit '
0e8cf97670c0b0a59d326507296829fe1bc01230':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Mon, 26 Oct 2015 23:49:22 +0000 (23:49 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8 am:
cc9ac27157
am:
fe64ce145e -s ours
* commit '
fe64ce145e243fb3fde5a788bcd800c2987da37c':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Mon, 26 Oct 2015 23:46:01 +0000 (23:46 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8
am:
cc9ac27157
* commit '
cc9ac271575b4c1ef3a2bff3fbdaf2b201c6e75d':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Mon, 26 Oct 2015 23:42:57 +0000 (23:42 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE
am:
6575d4a2a8
* commit '
6575d4a2a8c78a703e5c2e2889ecb358668d1bbd':
Update security string to 2015-12-01 - DO NOT MERGE
The Android Automerger [Mon, 26 Oct 2015 08:02:59 +0000 (01:02 -0700)]
"MMB26"
The Android Automerger [Mon, 26 Oct 2015 08:00:12 +0000 (01:00 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Fri, 23 Oct 2015 23:14:05 +0000 (16:14 -0700)]
"MMB23"
The Android Automerger [Fri, 23 Oct 2015 23:13:14 +0000 (16:13 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Fri, 23 Oct 2015 17:12:10 +0000 (10:12 -0700)]
"MMB22C"
The Android Automerger [Thu, 22 Oct 2015 22:42:19 +0000 (15:42 -0700)]
"MMB22B"
The Android Automerger [Thu, 22 Oct 2015 22:41:44 +0000 (15:41 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
Zach Jang [Thu, 22 Oct 2015 22:03:14 +0000 (15:03 -0700)]
Update security string to 2015-12-01
Change-Id: I2e07d57e457effdcf685203dabfcfefa47c70bf3
Zach Jang [Thu, 22 Oct 2015 22:00:30 +0000 (15:00 -0700)]
Update security string to 2015-12-01 - DO NOT MERGE
Change-Id: I155ec6c2b57c899f20bb85f5a5cf031499ba81b0
Ian Pedowitz [Sat, 10 Oct 2015 18:00:52 +0000 (11:00 -0700)]
Bump Android to 6.0.1
Bug:
24777474
Change-Id: Ibaca3c2d583aa92c8ca998b6d380ee720b71b1b8
The Android Automerger [Thu, 22 Oct 2015 08:01:28 +0000 (01:01 -0700)]
"MMB22"
The Android Automerger [Thu, 22 Oct 2015 08:00:23 +0000 (01:00 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Wed, 21 Oct 2015 17:48:34 +0000 (10:48 -0700)]
"MMB21B"
The Android Automerger [Wed, 21 Oct 2015 17:47:22 +0000 (10:47 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Wed, 21 Oct 2015 08:01:18 +0000 (01:01 -0700)]
"MMB21"
The Android Automerger [Wed, 21 Oct 2015 08:00:15 +0000 (01:00 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Tue, 20 Oct 2015 08:02:50 +0000 (01:02 -0700)]
"MMB20"
The Android Automerger [Tue, 20 Oct 2015 08:00:21 +0000 (01:00 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
Zach Jang [Tue, 20 Oct 2015 00:57:33 +0000 (17:57 -0700)]
Update security string to 2015-12-01
Change-Id: I525bab4579449dd285ba87d7ddc9cb36223bf7fd
The Android Automerger [Mon, 19 Oct 2015 08:00:12 +0000 (01:00 -0700)]
"MMB19"
The Android Automerger [Mon, 19 Oct 2015 08:00:07 +0000 (01:00 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Sun, 18 Oct 2015 14:03:53 +0000 (07:03 -0700)]
"MMB18"
The Android Automerger [Sun, 18 Oct 2015 14:01:39 +0000 (07:01 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
Tao Bao [Sat, 17 Oct 2015 01:19:15 +0000 (01:19 +0000)]
am
bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev
* commit '
bc5e85afc9cbbbb3c7e7364a6ff2a29cfb596d38':
DO NOT MERGE releasetools: Always write the last block if it's padded.
Tao Bao [Sat, 17 Oct 2015 01:15:39 +0000 (01:15 +0000)]
Merge "DO NOT MERGE releasetools: Always write the last block if it's padded." into mnc-dev
Tao Bao [Sat, 17 Oct 2015 00:09:35 +0000 (00:09 +0000)]
am
e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
* commit '
e09359abc0f8c29fbb16d35ab7375d80fde6f931':
DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
Tao Bao [Tue, 13 Oct 2015 23:37:12 +0000 (16:37 -0700)]
DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
When building incremental packages, the info_dict from the source build
should be the one in use. We have done that for most of the partitions
(system and etc.), and should pass that to vendor's script as well.
Also includes the CL in commit
aac4ad56b6c60e271d807604b20f72084c58b426
that fixes a bug in commit
6f0b219ac551710c724e3f344023943178cdc217.
Bug:
24898607
Change-Id: I4ea6037dad7061e1683661fc4c394fa3a7a7c5cd
(cherry picked from commit
6f0b219ac551710c724e3f344023943178cdc217)
Tao Bao [Sun, 6 Sep 2015 03:35:32 +0000 (20:35 -0700)]
DO NOT MERGE releasetools: Always write the last block if it's padded.
In BBOTAs if the last block of a DataImage is padded, we should always
write the whole block even for incremental OTAs. Because otherwise the
last block may be skipped if unchanged, but would fail the post-install
verification if it has non-zero contents in the padding bytes.
Bug:
24981812
Change-Id: Id0608384fcff0375aec8c158e6f909569b873d31
(cherry picked from commit
7589e961a7b8b7d964704db87f83ed8811e97ac6)
The Android Automerger [Thu, 15 Oct 2015 08:01:37 +0000 (01:01 -0700)]
"MMB15"
The Android Automerger [Thu, 15 Oct 2015 08:00:24 +0000 (01:00 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Wed, 14 Oct 2015 08:01:54 +0000 (01:01 -0700)]
"MMB14"
The Android Automerger [Wed, 14 Oct 2015 08:00:25 +0000 (01:00 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
Dan Willemsen [Mon, 12 Oct 2015 22:26:52 +0000 (15:26 -0700)]
Add all-named-(dirs|files)-under and related
To consolidate the number of places that we're using 'find' in the tree,
add some more helpers:
all-named-dirs-under
all-subdir-named-dirs
all-named-files-under
all-subdir-named-files
This change also makes many of the current helpers use these helpers
instead of using their own implementation.
The 'dirs' helpers are using '-type d' so that they only output
directories. It's probably safe to use '-type f' for the files helpers,
but that increased the kati load time by ~20%.
Bug:
24204119
Change-Id: I3312e2fe8c146f10955e1d986ad15d9c8be494e1
Dan Willemsen [Tue, 29 Sep 2015 23:26:28 +0000 (16:26 -0700)]
Add all-cpp-files-under
There are multiple versions of this in the tree. Let's standardize on
one that will work for everyone, and will sort the results.
Bug:
24204119
Change-Id: I09fcd80e1e8e35e64d8a8a62bbc096f87b02603f
Dan Willemsen [Tue, 22 Sep 2015 23:54:12 +0000 (16:54 -0700)]
Sort all files found via $(shell find)
Don't rely on filesystem ordering to make these the same for all builds.
Bug:
24204119
Change-Id: I7313062157764091acecf45f4b57405c28858546
The Android Automerger [Tue, 13 Oct 2015 08:02:43 +0000 (01:02 -0700)]
"MMB13"
The Android Automerger [Tue, 13 Oct 2015 08:00:25 +0000 (01:00 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
Hans Boehm [Tue, 13 Oct 2015 00:08:04 +0000 (17:08 -0700)]
Switch from Calculator to ExactCalculator
Bug:
24875598
Use ExactCalculator for AOSP builds.
This is a manual (due to intervening commits) cherrypick of
commit
53c5891460408ffe37f2aecc2044320d49cef801 (ag/748830).
Change-Id: I6c0acef640e62f8a70b7b2832b7eea662a0d301b
Tao Bao [Mon, 12 Oct 2015 18:39:11 +0000 (18:39 +0000)]
Merge "DO NOT MERGE: Only use a fixed timestamp when packaging." into mnc-dr-dev
Ying Wang [Mon, 12 Oct 2015 17:22:45 +0000 (17:22 +0000)]
Merge "Don't add build number to apps' version name for platform build." into mnc-dr-dev
Tao Bao [Wed, 30 Sep 2015 23:01:14 +0000 (16:01 -0700)]
DO NOT MERGE: Only use a fixed timestamp when packaging.
This CL changes to use a fixed timestamp only when packaging
into the target_files zip.
Bug:
24377993
Change-Id: I01d136f4b99e1eff80c559192d93db83a3c5c0a4
(cherry picked from commit
822f5840c0f498e33829a0a00f383d9be3a7e913)
The Android Automerger [Mon, 12 Oct 2015 08:00:48 +0000 (01:00 -0700)]
"MMB12"
The Android Automerger [Mon, 12 Oct 2015 08:00:18 +0000 (01:00 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Sun, 11 Oct 2015 08:02:16 +0000 (01:02 -0700)]
"MMB11"
The Android Automerger [Sun, 11 Oct 2015 08:00:22 +0000 (01:00 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
Joe Fernandez [Fri, 9 Oct 2015 23:59:07 +0000 (23:59 +0000)]
am
b16edb5f: Merge "add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button." into mnc-dev
* commit '
b16edb5f3ef9032b7e19c29aac2496c34bb8ac76':
add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button.
Joe Fernandez [Fri, 9 Oct 2015 23:54:46 +0000 (23:54 +0000)]
Merge "add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button." into mnc-dev