OSDN Git Service
Baligh Uddin [Wed, 30 Sep 2015 18:39:15 +0000 (18:39 +0000)]
am
22ff0124: (-s ours) Merge "add otatools-package target" into cw-d-mr1-dev
* commit '
22ff0124fdde970072cea303b4328024994cd78c':
add otatools-package target
Ying Wang [Tue, 29 Sep 2015 21:57:09 +0000 (21:57 +0000)]
am
cb31a535: Dist the otatools package.
* commit '
cb31a535077947e45a97ef31a04b6a3b211ceb25':
Dist the otatools package.
Baligh Uddin [Tue, 29 Sep 2015 21:53:25 +0000 (21:53 +0000)]
Merge "add otatools-package target" into cw-d-mr1-dev
Ying Wang [Tue, 25 Aug 2015 00:13:53 +0000 (17:13 -0700)]
Dist the otatools package.
Bug:
23495952
(cherry picked from commit
267e957373765ad1e3ce89abe61886a305277027)
Change-Id: I49fcb9fed599268a9d37de7b14280eeb65c34788
(cherry picked from commit
fc028e59c2bc36297f23cdf2ee4fe9b1b60aa1cd)
Doug Zongker [Fri, 22 Aug 2014 15:04:58 +0000 (08:04 -0700)]
add otatools-package target
Add a target to zip up all the otatools and releasetools, for easy
copying to the OTA builder machine.
Change-Id: I55a6d93c1de75ac936d941c0e3ae72897407f563
(cherry picked from commit
f22b0f43efbc16c548692dc239a387edda15d78f)
(cherry picked from commit
32bf3f32651ddff9ffa2168017d71ec4b151a0a9)
Ying Wang [Tue, 29 Sep 2015 18:13:03 +0000 (18:13 +0000)]
am
3d6e194e: am
393c6254: Really include drawables for all densities.
* commit '
3d6e194eafbb441c79d4cd306af85eeb34fb75e8':
Really include drawables for all densities.
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:33:30 +0000 (21:33 +0000)]
am
92da6bdb: am
5e858e3d: Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-dev
* commit '
92da6bdb09e0c64996aee54da9c088f37dcc0724':
Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
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
Stephen Hines [Tue, 22 Sep 2015 19:49:39 +0000 (12:49 -0700)]
Add ld.mc as a requirement for core_tiny.mk as well.
Bug:
24171451
I missed this when I initially added ld.mc as a requirement for
core_minimal.mk. This is required for RenderScript linking on the
device.
Change-Id: Ie3ffa2454214f886c38387f45b34df2dcbebd6e6
(cherry picked from commit
446ae75fb7a596f86e40f700b82bf6199f9be22b)
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:13:22 +0000 (00:13 +0000)]
am
6a0bdb55: 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 '
6a0bdb551810df79a3561ebe4f1cfcde8583659b':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Tue, 22 Sep 2015 00:13:21 +0000 (00:13 +0000)]
am
22e66b35: am
a5842d3e: am
f694d378: (-s ours) resolved conflicts for
b161297d to lmp-mr1-ub-dev
* commit '
22e66b357450bc89d2e9426eddfd7d8ca9c50bc0':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
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
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:46:21 +0000 (04:46 +0000)]
am
59f4ff10: Add verity_signer and verity_key flags to add_img_to_target_files.
* commit '
59f4ff109d7da6d608cb6b1248a4403b13d8b2bc':
Add verity_signer and verity_key flags to add_img_to_target_files.
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:53:07 +0000 (17:53 +0000)]
am
ca352f36: am
2ad5c0cc: Merge "emulator.mk: Add ethernet permission" into mnc-dev
* commit '
ca352f3623ed6e3afb1c70b1daedaa29ec3b73a5':
emulator.mk: Add ethernet permission
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:48:58 +0000 (01:48 +0000)]
am
a0abf49d: resolved conflicts for
a1fcaf86 to mnc-dr-dev
* commit '
a0abf49d2bdc42c81e5f636e54da9038de9dfc21':
Add an option to include a full bootloader in incremental OTA.
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 08:01:45 +0000 (08:01 +0000)]
leozwang [Tue, 15 Sep 2015 07:58:27 +0000 (07:58 +0000)]
leozwang [Tue, 15 Sep 2015 07:57:43 +0000 (07:57 +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:58:06 +0000 (04:58 +0000)]
am
888b6f47: am
47f6a4e7: am
1c1a6d15: am
2c9dfb82: am
1d4ad515: Revert "Add an option to include a full bootloader in incremental OTA."
* commit '
888b6f47c73c7ff0f4780e4406f18a83dbd4d8c2':
Revert "Add an option to include a full bootloader in incremental OTA."
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:24:53 +0000 (01:24 +0000)]
am
160603cf: am
5837f102: am
1753b4e9: resolved conflicts for
00fdede3 to lmp-mr1-ub-dev
* commit '
160603cfc20362df30886a05735054842c6f79b8':
Add an option to include a full bootloader in incremental OTA.
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:07:41 +0000 (23:07 +0000)]
am
e35d00d0: am
265d9aeb: releasetools: Update the fingerprint when signing.
* commit '
e35d00d019aaff92b5e20b86d9c3b8222c0c946a':
releasetools: Update the fingerprint when signing.
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 [Tue, 8 Sep 2015 20:30:51 +0000 (20:30 +0000)]
am
28f6f9c3: releasetools: Always write the last block if it\'s padded.
* commit '
28f6f9c3deb4d23fd627d15631d682a5cfa989fc':
releasetools: Always write the last block if it's padded.
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 18:14:42 +0000 (18:14 +0000)]
am
a6e6afbc: am
39c322ce: releasetools: Fix the bug in symlink deletion.
* commit '
a6e6afbce69da968299898944bb2165f5e799886':
releasetools: Fix the bug in symlink deletion.
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:10:34 +0000 (00:10 +0000)]
am
9f7c3781: am
057831bc: Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev
* commit '
9f7c37811bc65cda63bd863d00ed7b7489c02bd2':
Set the Security Patch level with Oct 1 for MNC
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 23:07:58 +0000 (23:07 +0000)]
am
dfea066f: Merge "Include init.usb.configfs.rc into rootdir" into mnc-dr-dev
* commit '
dfea066f880f14d7203302ab667b9f096b210c08':
Include init.usb.configfs.rc into rootdir
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:10:11 +0000 (19:10 +0000)]
am
ccad82c5: Merge "Revert "Temporarily use blockimgdiff v2 for OTA."" into mnc-dr-dev
* commit '
ccad82c52e7c37c70fce579cf14377a88b885ae4':
Revert "Temporarily use blockimgdiff v2 for OTA."
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:46:46 +0000 (21:46 +0000)]
am
77c1ff7b: am
4ffdc8fa: Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug:
23570662
* commit '
77c1ff7bf983ef4622ecb227d4e5b0c75728c28f':
Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug:
23570662
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 21:10:06 +0000 (21:10 +0000)]
am
e337093e: Merge changes from topic \'stash-size\' into mnc-dr-dev
* commit '
e337093e6c5d502f0f4094639b41c001b3048d0f':
Split large files for BBOTA v3.
Revise stash for BBOTAs when needed.
Assert the stash size when generating OTAs.
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:46:10 +0000 (01:46 +0000)]
am
f4ad2feb: am
4fc14679: am
fc168f84: resolved conflicts for merge of
1a8c6567 to lmp-mr1-ub-dev
* commit '
f4ad2febdb6f87a08e5f8229b0f3b2d8a7dc25de':
Don't fail build of otatools if there are no device certificates
Ying Wang [Thu, 27 Aug 2015 01:46:09 +0000 (01:46 +0000)]
am
d0cc11e8: am
8f7c08ed: am
1e120181: am
473b6a5f: am
fc028e59: Dist the otatools package.
* commit '
d0cc11e89827e4f5b1526b909e138493cfb96da6':
Dist the otatools package.
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
Tao Bao [Wed, 26 Aug 2015 22:28:35 +0000 (15:28 -0700)]
Revert "Temporarily use blockimgdiff v2 for OTA."
This reverts commit
d07bfc519673fdba66448f0a81ef869b922c3804.
Real fixes [1][2][3] are ready to merge. Time to revert the workaround.
[1] commit
d47d8e14880132c42a75f41c8041851797c75e35
[2] commit
1fc67631eedbfba07e005d85aadae6e1b91d8d93
[3] commit
937847ae493d36b9741f6387a2357d5cdceda3d9
Bug:
22430577
Change-Id: Icd6623e8717c93ad1f12cd1ba43db5e006e928ad
Tao Bao [Tue, 25 Aug 2015 22:10:10 +0000 (15:10 -0700)]
Split large files for BBOTA v3.
For BBOTA v3, we need to stash source blocks to support resumable
feature. However, with the growth of file size and the shrink of the
cache size, source blocks that represent a file are too large to be
stashed as a whole. CL in [1] solves the issue by replacing the diff
command with a "new" command. However, it may increase the generated
package size substantially (e.g. from ~100MB to ~400MB).
With this CL, if a file spans too many blocks, we split it into smaller
pieces by generating multiple commands. For the same case above, it
reduces the package size to ~150MB.
One potential downside is that after splitting, files like .jar,
.apk and .zip can no longer use imgdiff. We may lose the potential
benefit of using imgdiff for patch size reduction.
[1] commit
82c47981bd0602a1c7b50dfabf9a6a2412993bae
Bug:
22430577
Change-Id: Iee1ad6543f3d40368e079e418cc31728e1ab3f48
(cherry picked from commit
9a5caf2c30e5dcb19823dff328de1cfb140a2799)
Tao Bao [Mon, 17 Aug 2015 16:45:13 +0000 (09:45 -0700)]
Revise stash for BBOTAs when needed.
When generating incremental BBOTAs (v2 and above), we need to ensure
that the needed runtime stash is below the given threshold. If it's
running out of space on /cache, we replace the command that uses a
stash with a "new" command instead.
This may increase the OTA package size, since it is carrying more full
blocks instead of patches. It gets even worse for large files that span
a number of blocks, because currently we will store all the blocks for
the file as "new" blocks if stashing cannot be satisfied. We may further
optimize by splitting them into smaller chunks so that most of them can
still be stashed.
Bug:
22430577
Change-Id: Ieae5243d461e3f899f613f76a380f6f7c3edb356
(cherry picked from commit
82c47981bd0602a1c7b50dfabf9a6a2412993bae)
Tao Bao [Thu, 21 May 2015 21:09:49 +0000 (14:09 -0700)]
Assert the stash size when generating OTAs.
With block-based OTA v2 and v3, it requires stash space on the /cache
partition to back up blocks during an update. We need to ensure that
it doesn't exceed the partition size. Since there might be other files
on /cache as well, we use cache_size * threshold as the maximum allowed
size. The threshold defaults to 0.8, which can be overridden by command
line option '--stash_threshold'.
Change-Id: Ieee5d373c9bfb2ea401d85ca8a3adb491579de76
(cherry picked from commit
23ac4042128e47f6fe1ef176e7cb96f907d8e149)
Ying Wang [Wed, 26 Aug 2015 20:17:16 +0000 (20:17 +0000)]
am
473b6a5f: am
fc028e59: Dist the otatools package.
* commit '
473b6a5f2b00f941acb08b5c3df59cbbdf647609':
Dist the otatools package.
Claes Elgemark [Wed, 26 Aug 2015 17:14:49 +0000 (17:14 +0000)]
am
8d771971: Don\'t fail build of otatools if there are no device certificates
* commit '
8d771971212069f77851163f437c782f581bf6db':
Don't fail build of otatools if there are no device certificates
Claes Elgemark [Wed, 1 Apr 2015 09:29:29 +0000 (11:29 +0200)]
Don't fail build of otatools if there are no device certificates
Bug:
23552169
Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
Bart Sears [Wed, 26 Aug 2015 03:55:25 +0000 (03:55 +0000)]
am
8a1fa158: am
c69aa42b: Merge "Set the Security Patch level for MNC" into mnc-dev
* commit '
8a1fa15844e0ad73d3b327ff567012e485e7896d':
Set the Security Patch level for MNC
Bart Sears [Wed, 26 Aug 2015 03:49:10 +0000 (03:49 +0000)]
am
c69aa42b: Merge "Set the Security Patch level for MNC" into mnc-dev
* commit '
c69aa42b4331569814d23336412e6754a0495d65':
Set the Security Patch level for MNC
Bart Sears [Wed, 26 Aug 2015 03:40:38 +0000 (03:40 +0000)]
Merge "Set the Security Patch level for MNC" into mnc-dev
Tao Bao [Tue, 25 Aug 2015 23:49:14 +0000 (23:49 +0000)]
am
d3a79db8: am
afc5ab39: am
c6e087ad: resolved conflicts for merge of
2bcfbe7e to lmp-mr1-ub-dev
* commit '
d3a79db8fe09ac4d5bb404f4bb48a5f66d005db2':
add otatools-package target
Tao Bao [Tue, 25 Aug 2015 23:39:51 +0000 (23:39 +0000)]
am
afc5ab39: am
c6e087ad: resolved conflicts for merge of
2bcfbe7e to lmp-mr1-ub-dev
* commit '
afc5ab39d84e9fc5fecbcd3c5a77fe4f956ff825':
add otatools-package target