OSDN Git Service
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
smain@google.com [Fri, 9 Oct 2015 23:30:05 +0000 (16:30 -0700)]
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.
Change-Id: I1b5b8b516a5b8d7fd8433c02011cb4fb2044b71f
The Android Automerger [Thu, 8 Oct 2015 16:32:24 +0000 (09:32 -0700)]
"MMB08B"
The Android Automerger [Thu, 8 Oct 2015 16:32:15 +0000 (09:32 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Thu, 8 Oct 2015 08:01:27 +0000 (01:01 -0700)]
"MMB08"
The Android Automerger [Thu, 8 Oct 2015 08:00:19 +0000 (01:00 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Wed, 7 Oct 2015 16:01:22 +0000 (09:01 -0700)]
"MMB07B"
The Android Automerger [Wed, 7 Oct 2015 16:01:00 +0000 (09:01 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Wed, 7 Oct 2015 15:50:10 +0000 (08:50 -0700)]
MMB07
Zach Jang [Tue, 6 Oct 2015 01:01:12 +0000 (18:01 -0700)]
Reverting Android Security Patch Level string back to 2015-10-01
Change-Id: I0ecc1c9103e7686dffcb8b7009d52aa8d546ae0b
Brian Carlstrom [Sun, 4 Oct 2015 19:47:22 +0000 (19:47 +0000)]
am
f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev
* commit '
f73f79f1b63c7cb7679264a6c6e4f86fdd78309c':
Use $OUT_DIR/filelist when OUT_DIR is set
Brian Carlstrom [Sun, 4 Oct 2015 19:40:41 +0000 (19:40 +0000)]
Merge "Use $OUT_DIR/filelist when OUT_DIR is set" into mnc-dev
Brian Carlstrom [Thu, 1 Oct 2015 03:28:54 +0000 (20:28 -0700)]
Use $OUT_DIR/filelist when OUT_DIR is set
Change-Id: Iadf3f05e752d71371d3d74e670ade3e937b1cd92
Ying Wang [Tue, 29 Sep 2015 18:07:41 +0000 (18:07 +0000)]
am
393c6254: Really include drawables for all densities.
* commit '
393c62549a6340b3473f14b71d583e118d7e6a6d':
Really include drawables for all densities.
Ying Wang [Fri, 12 Jun 2015 17:33:59 +0000 (10:33 -0700)]
Really include drawables for all densities.
Previously with "PRODUCT_AAPT_CONFIG := normal" resource with modifier
"small" isn't included.
Bug:
21643610
Change-Id: I53940d716fb9705462b1abb882e04103e211f8af
Zach Jang [Mon, 28 Sep 2015 21:27:22 +0000 (21:27 +0000)]
am
5e858e3d: Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-dev
* commit '
5e858e3db9f7b2037dc9e03c08f9687d5a6718bd':
Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
Zach Jang [Mon, 28 Sep 2015 21:17:41 +0000 (21:17 +0000)]
Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-dev
Zach Jang [Tue, 22 Sep 2015 00:42:49 +0000 (17:42 -0700)]
Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
Change-Id: I80e1e5766c33f1a5c1e28e456dfe902bc8886fd4
Zach Jang [Tue, 22 Sep 2015 00:04:43 +0000 (00:04 +0000)]
am
64685ea3: am
ef024064: (-s ours) am
09611509: am
63712481: am
bb97ff59: am
a7168e1c: am
e539537d: (-s ours) am
7f96f4f6: am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
64685ea320f8916087b8fd022ab1ce3028bec62a':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Tue, 22 Sep 2015 00:04:42 +0000 (00:04 +0000)]
am
a5842d3e: am
f694d378: (-s ours) resolved conflicts for
b161297d to lmp-mr1-ub-dev
* commit '
a5842d3e17f2d619f5de7bfae85f58ff9642dae4':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Mon, 21 Sep 2015 23:57:06 +0000 (23:57 +0000)]
am
ef024064: (-s ours) am
09611509: am
63712481: am
bb97ff59: am
a7168e1c: am
e539537d: (-s ours) am
7f96f4f6: am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
ef02406452c41f90955460179c1f1d900bcedba9':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Mon, 21 Sep 2015 23:57:04 +0000 (23:57 +0000)]
am
f694d378: (-s ours) resolved conflicts for
b161297d to lmp-mr1-ub-dev
* commit '
f694d378955ddac3ee2651080bfa00c5ae39dddc':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Ying Wang [Sat, 19 Sep 2015 17:56:35 +0000 (10:56 -0700)]
Don't add build number to apps' version name for platform build.
Bug:
24201956
Change-Id: I4a4bb483bb7b1bf7b7a856050d548bee4db0fe93
Zach Jang [Mon, 21 Sep 2015 21:06:10 +0000 (21:06 +0000)]
am
09611509: am
63712481: am
bb97ff59: am
a7168e1c: am
e539537d: (-s ours) am
7f96f4f6: am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
0961150929c775a439f31b8c4fb35ba6a03c6f08':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Mon, 21 Sep 2015 20:00:04 +0000 (13:00 -0700)]
resolved conflicts for
b161297d to lmp-mr1-ub-dev
Change-Id: I9bfac79b7d0cc7c6a3e501b15d5bd91781e6246e
Zach Jang [Mon, 21 Sep 2015 19:05:35 +0000 (19:05 +0000)]
am
63712481: am
bb97ff59: am
a7168e1c: am
e539537d: (-s ours) am
7f96f4f6: am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
63712481f04b6525288b5df182d6f3e853a3bfb9':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Mon, 21 Sep 2015 19:05:33 +0000 (19:05 +0000)]
am
ab095b44: am
48e2b43e: am
47ef4c34: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
ab095b445af361911df2856e77f43c4cf103a0e2':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Mon, 21 Sep 2015 18:58:22 +0000 (18:58 +0000)]
am
bb97ff59: am
a7168e1c: am
e539537d: (-s ours) am
7f96f4f6: am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
bb97ff5941b266639e31fd4a30a6d34921e7bc2b':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Mon, 21 Sep 2015 18:58:10 +0000 (18:58 +0000)]
am
48e2b43e: am
47ef4c34: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
48e2b43e8cc030456b0f625f321c45d2e1775130':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Thu, 17 Sep 2015 20:40:28 +0000 (20:40 +0000)]
am
a7168e1c: am
e539537d: (-s ours) am
7f96f4f6: am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
a7168e1c6ef9e9bc5491b09cb9db683b69e25e2b':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Thu, 17 Sep 2015 20:27:20 +0000 (20:27 +0000)]
am
e539537d: (-s ours) am
7f96f4f6: am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
e539537d8c7a4288f40afa9226787b9af3d4416b':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Thu, 17 Sep 2015 20:16:43 +0000 (20:16 +0000)]
am
7f96f4f6: am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
7f96f4f6b95de53bd4aaff762885050ad7c4a7be':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Thu, 17 Sep 2015 20:04:23 +0000 (20:04 +0000)]
am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
4c710cbe7f5786c3df396ea4283da920fd5c351b':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Thu, 17 Sep 2015 20:04:17 +0000 (20:04 +0000)]
am
47ef4c34: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
47ef4c3467e4f895b776fb0e8dbcba8f90a9398c':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Baligh Uddin [Thu, 17 Sep 2015 04:20:30 +0000 (21:20 -0700)]
Add verity_signer and verity_key flags to add_img_to_target_files.
The signing process requires the boot and recovery images be signed
by CROS-Signer, which is done after a signed_target_files.zip is
available. Once the boot/recovery images are signed, we need
to insert it back into signed_target_files.zip and regenerate the
system.map and verity tree. The script (add_img_to_target_files) does
this operation and needs to be aware of verity specific flags.
Bug:
23831896
Change-Id: Id24e878161052c768b74da1231b97eb0574b4c8b
Zach Jang [Sat, 12 Sep 2015 00:27:09 +0000 (17:27 -0700)]
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings
CL#2/3
b/
23946860
Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3
Zach Jang [Sat, 12 Sep 2015 00:27:09 +0000 (17:27 -0700)]
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings
CL#2/3
b/
23946860
Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3
Bo Hu [Wed, 16 Sep 2015 17:45:59 +0000 (17:45 +0000)]
am
2ad5c0cc: Merge "emulator.mk: Add ethernet permission" into mnc-dev
* commit '
2ad5c0cca46b7f0a159dbc90243756c84a93b093':
emulator.mk: Add ethernet permission
Bo Hu [Wed, 16 Sep 2015 17:38:07 +0000 (17:38 +0000)]
Merge "emulator.mk: Add ethernet permission" into mnc-dev
Ian Pedowitz [Wed, 16 Sep 2015 01:39:19 +0000 (18:39 -0700)]
resolved conflicts for
a1fcaf86 to mnc-dr-dev
Change-Id: Ie53652faa530a3c9c83f30c8f2b636d90f0f1b7a
leozwang [Tue, 15 Sep 2015 15:44:12 +0000 (08:44 -0700)]
Add an option to include a full bootloader in incremental OTA.
Bug:
23999213
Change-Id: I6c715eb01048e187622ba1e90c89a3306a294b8a
leozwang [Tue, 15 Sep 2015 07:58:27 +0000 (07:58 +0000)]
leozwang [Tue, 15 Sep 2015 07:52:08 +0000 (07:52 +0000)]
leozwang [Tue, 15 Sep 2015 07:41:53 +0000 (00:41 -0700)]
Fix build.
Convert ota_from_target_files back to symbolic link.
Change-Id: I932ba8c0b15fa71a27083adc92e9f9a90dc82f8c
(cherry picked from commit
17aa06f6fe0c10cb3bb84a11dfc78a88a4155adc)
leozwang [Tue, 15 Sep 2015 07:41:53 +0000 (00:41 -0700)]
Fix build.
Convert ota_from_target_files back to symbolic link.
Change-Id: I932ba8c0b15fa71a27083adc92e9f9a90dc82f8c
Leo Wang [Tue, 15 Sep 2015 04:51:19 +0000 (04:51 +0000)]
am
47f6a4e7: am
1c1a6d15: am
2c9dfb82: am
1d4ad515: Revert "Add an option to include a full bootloader in incremental OTA."
* commit '
47f6a4e72592bef7ed91f2541c55c151428e11ad':
Revert "Add an option to include a full bootloader in incremental OTA."
Leo Wang [Tue, 15 Sep 2015 04:43:38 +0000 (04:43 +0000)]
am
1c1a6d15: am
2c9dfb82: am
1d4ad515: Revert "Add an option to include a full bootloader in incremental OTA."
* commit '
1c1a6d15b2c979f28d3cf9a13e96e16e24be16ec':
Revert "Add an option to include a full bootloader in incremental OTA."
Leo Wang [Tue, 15 Sep 2015 04:36:53 +0000 (04:36 +0000)]
am
2c9dfb82: am
1d4ad515: Revert "Add an option to include a full bootloader in incremental OTA."
* commit '
2c9dfb8239bb4cbe1c9118ccc5bd115713f513e6':
Revert "Add an option to include a full bootloader in incremental OTA."
Leo Wang [Tue, 15 Sep 2015 04:29:45 +0000 (04:29 +0000)]
am
1d4ad515: Revert "Add an option to include a full bootloader in incremental OTA."
* commit '
1d4ad5158b2cf2f30269d8f733548188208af64a':
Revert "Add an option to include a full bootloader in incremental OTA."
Leo Wang [Tue, 15 Sep 2015 04:03:20 +0000 (04:03 +0000)]
Revert "Add an option to include a full bootloader in incremental OTA."
This reverts commit
46d5efcd0d451a48cc793931efef2b1ca982386d.
Change-Id: Ibd347be362db50c0cdb34bf828718872bd74ad56
leozwang [Tue, 15 Sep 2015 01:17:03 +0000 (01:17 +0000)]
am
5837f102: am
1753b4e9: resolved conflicts for
00fdede3 to lmp-mr1-ub-dev
* commit '
5837f1025cf28935f3c6f3e0417dcfeac4d56688':
Add an option to include a full bootloader in incremental OTA.
leozwang [Tue, 15 Sep 2015 01:07:05 +0000 (01:07 +0000)]
am
1753b4e9: resolved conflicts for
00fdede3 to lmp-mr1-ub-dev
* commit '
1753b4e9e444d9ce57f5ce481ed5e3317670ee31':
Add an option to include a full bootloader in incremental OTA.
bohu [Mon, 14 Sep 2015 23:02:43 +0000 (16:02 -0700)]
emulator.mk: Add ethernet permission
Networking on old emulator device(a.k.a. goldfish) relies on RIL;
However, RIL is not available on ranchu device yet. For ranchu device
to have a functional networking, we need to add ethernet permission
and start dhcpcd_eth0 service on ranchu device. This CL adds ethernet
permission to both goldfish (which is harmless) and ranchu devices.
This addition was originally proposed by miroslav.tisma@imgtec.com
and the ethernet permission was only added to arm64 and mips64 after
discussion. With the ranchu device supporting more architectures,
it makes sense to allow this permission on all devices and all CPU
architectures.
related CL by miroslav.tisma@imgtec.com on AOSP:
b09fb84becf73bf2bc578ebf27910d75b79d668a
bug:
24070972
Change-Id: I81ac5d8901adee43784fe9dd45a170fb90bb824a
leozwang [Mon, 14 Sep 2015 23:39:23 +0000 (16:39 -0700)]
resolved conflicts for
00fdede3 to lmp-mr1-ub-dev
Change-Id: If4b79f7ed4d67cd8ed708a84703eac58b1e979ac
leozwang [Mon, 14 Sep 2015 21:27:04 +0000 (21:27 +0000)]
am
46d5efcd: Add an option to include a full bootloader in incremental OTA.
* commit '
46d5efcd0d451a48cc793931efef2b1ca982386d':
Add an option to include a full bootloader in incremental OTA.
leozwang [Fri, 14 Aug 2015 17:57:58 +0000 (10:57 -0700)]
Add an option to include a full bootloader in incremental OTA.
Bug:
23101469
Bug:
23999213
Change-Id: Id5ed748a5639663bb5df954f9375838fd9c295ca
Tao Bao [Sat, 12 Sep 2015 23:00:24 +0000 (23:00 +0000)]
am
265d9aeb: releasetools: Update the fingerprint when signing.
* commit '
265d9aeb622c5829787b16b903f028cacaa99c18':
releasetools: Update the fingerprint when signing.
Tao Bao [Fri, 11 Sep 2015 22:27:56 +0000 (15:27 -0700)]
releasetools: Update the fingerprint when signing.
ro.bootimage.build.fingerprint should be updated when signing.
Bug:
22720426
Bug:
24009888
Change-Id: I5bd31858c6bc31edcecc6f5248f4274481506288
Tao Bao [Sun, 6 Sep 2015 03:35:32 +0000 (20:35 -0700)]
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:
23828506
Change-Id: I6f6789eec568ed0b808b9e425f5ecdbea1bdf446
(cherry picked from commit
7589e961a7b8b7d964704db87f83ed8811e97ac6)
Tao Bao [Thu, 3 Sep 2015 17:26:12 +0000 (17:26 +0000)]
am
39c322ce: releasetools: Fix the bug in symlink deletion.
* commit '
39c322cefcc0ecba76a2ffb8881694fd010a87fc':
releasetools: Fix the bug in symlink deletion.
Tao Bao [Wed, 2 Sep 2015 17:28:08 +0000 (10:28 -0700)]
releasetools: Fix the bug in symlink deletion.
For file-based OTAs, symlinks in the source build but not in the target
build will be deleted. However, if a symlink is replaced by a regular
file in the target build, the file will be accidentally deleted when
applying (resuming) the same package again.
Verify the checksum of a symlink that will be unpacked or renamed to.
Delete the file only if it doesn't have the target checksum.
Bug:
23646151
Change-Id: I77bae035e39f2e0be25f7f6d71c5882464e3d50f
(cherry picked from commit
84006eacd05e3f2784a0ecdf36609767f2c34044)
Zach Jang [Wed, 2 Sep 2015 00:04:40 +0000 (00:04 +0000)]
am
057831bc: Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev
* commit '
057831bc665b15d7beda970b91b2c332dee417f0':
Set the Security Patch level with Oct 1 for MNC
Zach Jang [Tue, 1 Sep 2015 23:51:02 +0000 (23:51 +0000)]
Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev
Badhri Jagan Sridharan [Tue, 1 Sep 2015 22:57:27 +0000 (22:57 +0000)]
Merge "Include init.usb.configfs.rc into rootdir" into mnc-dr-dev
Badhri Jagan Sridharan [Sat, 29 Aug 2015 02:44:05 +0000 (19:44 -0700)]
Include init.usb.configfs.rc into rootdir
Bug=
23633457
Change-Id: I26bbc5ff597138b2ccac1de72117753739b31554
Tao Bao [Tue, 1 Sep 2015 19:02:24 +0000 (19:02 +0000)]
Merge "Revert "Temporarily use blockimgdiff v2 for OTA."" into mnc-dr-dev
smain@google.com [Mon, 31 Aug 2015 21:36:29 +0000 (21:36 +0000)]
am
4ffdc8fa: Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug:
23570662
* commit '
4ffdc8faf2c795027f38b6ef4685dd6d1179878e':
Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug:
23570662
Tao Bao [Mon, 31 Aug 2015 20:59:48 +0000 (20:59 +0000)]
Merge changes from topic 'stash-size' into mnc-dr-dev
* changes:
Split large files for BBOTA v3.
Revise stash for BBOTAs when needed.
Assert the stash size when generating OTAs.
Zach Jang [Mon, 31 Aug 2015 17:12:17 +0000 (10:12 -0700)]
Set the Security Patch level with Oct 1 for MNC
- MNC currently has security patches from the August OEM bulletin with patch date of Sep 1 plus only critical fixes from September OEM bulletin
- To be cherry-picked if picking up remaining fixes from September OEM bulletin to MNC
Change-Id: I2d1ba9c5a893727962f3f1837df1dd9df49e44f5
smain@google.com [Fri, 28 Aug 2015 23:51:12 +0000 (16:51 -0700)]
Fix bug that caused table of Studio links to result in "stand-alone" tools instructions.
bug:
23570662
Change-Id: I7482eddbeffa581307bf7f76b9653de41966b6f9
Ying Wang [Thu, 27 Aug 2015 01:37:54 +0000 (01:37 +0000)]
am
4fc14679: am
fc168f84: resolved conflicts for merge of
1a8c6567 to lmp-mr1-ub-dev
* commit '
4fc1467949aaf9e6a49a6771ed996e3c2c702314':
Don't fail build of otatools if there are no device certificates
Ying Wang [Thu, 27 Aug 2015 01:37:53 +0000 (01:37 +0000)]
am
8f7c08ed: am
1e120181: am
473b6a5f: am
fc028e59: Dist the otatools package.
* commit '
8f7c08ed622d733c0997324d5b0464ba7e57c1fa':
Dist the otatools package.
Ying Wang [Thu, 27 Aug 2015 01:33:15 +0000 (01:33 +0000)]
am
fc168f84: resolved conflicts for merge of
1a8c6567 to lmp-mr1-ub-dev
* commit '
fc168f84695f492f2ad0eed3063145f425bebf45':
Don't fail build of otatools if there are no device certificates
Ying Wang [Thu, 27 Aug 2015 01:27:37 +0000 (01:27 +0000)]
am
1e120181: am
473b6a5f: am
fc028e59: Dist the otatools package.
* commit '
1e120181f0a9240eca61dface4fb4530bf2594ab':
Dist the otatools package.
Ying Wang [Thu, 27 Aug 2015 00:03:18 +0000 (17:03 -0700)]
resolved conflicts for merge of
1a8c6567 to lmp-mr1-ub-dev
Change-Id: Iadb7c55c246705ac10c6822b7bb5d71794ce485b
OSDN Git Service
