Commit graph

3378 commits

Author SHA1 Message Date
Tao Bao
c66e31a607 Merge "releasetools: Pack updatable images into IMAGES/ for A/B update." am: 128466cea5 am: 2c1a4b9e88
am: 3fac901b0c

* commit '3fac901b0cbc143c82395b5ba358d6ca8ad57375':
  releasetools: Pack updatable images into IMAGES/ for A/B update.
2015-11-18 17:53:04 +00:00
Tao Bao
2c1a4b9e88 Merge "releasetools: Pack updatable images into IMAGES/ for A/B update."
am: 128466cea5

* commit '128466cea5358eadbde19f52f16eef03f2685446':
  releasetools: Pack updatable images into IMAGES/ for A/B update.
2015-11-17 05:37:01 +00:00
Tao Bao
128466cea5 Merge "releasetools: Pack updatable images into IMAGES/ for A/B update." 2015-11-17 05:32:56 +00:00
Tao Bao
a0421cd1bd releasetools: Pack updatable images into IMAGES/ for A/B update.
Vendor-specific images (radio, bootloader and etc) used to stay in
RADIO/ in target_files zip. A/B updater expects them to be available
under IMAGES/. Make a copy for such images when calling
add_img_to_target_files.py.

We cannot move them directly from RADIO/ to IMAGES/, because we will
delete everything under IMAGES/ when signing for release.

Bug: 25674625
Change-Id: I977c879d0ff7e45c83b3f5c63844a5b135caa383
2015-11-16 16:42:43 -08:00
Tao Bao
2fd618ac56 Merge "build: Remove check_prereq." am: 79dd4b2983 am: 741c16686e
am: 0fa52e0d15

* commit '0fa52e0d1598290bd83b4a7a6536848e20628db2':
  build: Remove check_prereq.
2015-11-12 23:04:44 +00:00
Tao Bao
741c16686e Merge "build: Remove check_prereq."
am: 79dd4b2983

* commit '79dd4b29831b5fe5b6d9627c0b0373374c4e3036':
  build: Remove check_prereq.
2015-11-12 16:46:13 +00:00
Tao Bao
79dd4b2983 Merge "build: Remove check_prereq." 2015-11-12 16:41:45 +00:00
Tao Bao
cb4abef523 build: Remove check_prereq.
check_prereq is a tool for recovery API v2, which has been obselete
since we moved to v3 in [1].

[1] commit e08991e02a7d678f2574e85289a34b2a9a537c82

Bug: 24621915
Change-Id: Ie96348fb56c5a3e029cac2417b59d8eb62dc085b
2015-11-11 21:26:29 -08:00
Dan Willemsen
24a4410e38 Merge "Add tool to diff two target files packages" am: 5685af316e am: 44c9fc0c28
am: 0aa34ca7a1

* commit '0aa34ca7a11fac5660a8f78ec1f709b8c05e19f1':
  Add tool to diff two target files packages
2015-11-12 05:25:25 +00:00
Dan Willemsen
44c9fc0c28 Merge "Add tool to diff two target files packages"
am: 5685af316e

* commit '5685af316e5e3f9601c8c56a68cad9b833153268':
  Add tool to diff two target files packages
2015-11-12 05:20:03 +00:00
Dan Willemsen
5685af316e Merge "Add tool to diff two target files packages" 2015-11-12 05:16:29 +00:00
Tao Bao
1a6eef944a Merge "releasetools: Support generating verify packages." am: 6af8ef528b am: 58dcdc41c0
am: c4d4018f10

* commit 'c4d4018f10efc0a5dc82f4f5f2be44482557cb42':
  releasetools: Support generating verify packages.
2015-11-11 22:07:09 +00:00
Tao Bao
58dcdc41c0 Merge "releasetools: Support generating verify packages."
am: 6af8ef528b

* commit '6af8ef528b97614bbb6cd6733ae5a8bc2fb8fbda':
  releasetools: Support generating verify packages.
2015-11-11 21:58:52 +00:00
Tao Bao
6af8ef528b Merge "releasetools: Support generating verify packages." 2015-11-11 21:53:11 +00:00
Tao Bao
99a80875b6 Merge "releasetools: Refactor ota_from_target_files.py." am: c1c01c6504 am: a95168b221
am: 391c7666e1

* commit '391c7666e1a1414bb546e0d0e97540bd316aa368':
  releasetools: Refactor ota_from_target_files.py.
2015-11-11 19:55:10 +00:00
Tao Bao
a95168b221 Merge "releasetools: Refactor ota_from_target_files.py."
am: c1c01c6504

* commit 'c1c01c65042a84f9d12a1683451433ebaa111545':
  releasetools: Refactor ota_from_target_files.py.
2015-11-11 19:45:41 +00:00
Tao Bao
c1c01c6504 Merge "releasetools: Refactor ota_from_target_files.py." 2015-11-11 19:38:44 +00:00
Dan Willemsen
2fb3ecbc6e Merge "Create reproducible NOTICE collections" am: 92d746d158 am: eb861a7bc1
am: bcdc6f10a0

* commit 'bcdc6f10a03b9c22d3fbe23632703801fafc8b00':
  Create reproducible NOTICE collections
2015-11-10 21:50:36 +00:00
Dan Willemsen
eb861a7bc1 Merge "Create reproducible NOTICE collections"
am: 92d746d158

* commit '92d746d1580054722e0bdab9283f515a69e9c1ec':
  Create reproducible NOTICE collections
2015-11-10 21:46:09 +00:00
Tao Bao
9bc6bb23b5 releasetools: Support generating verify packages.
We can generate a special OTA package that verifies all the partitions
(boot, recovery, system, vendor and etc) on a device. It also calls
device-specific script to verify bootloader and radio images. This
ensures a flashed device contains all the desired images faithfully.

Usage:
ota_from_target_files.py --gen_verify target_files.zip output.zip

Bug: 24679956
Change-Id: Ib3091d98c4b17a6fad305b3edf16d09efbda5c38
2015-11-10 12:49:33 -08:00
Dan Willemsen
8ae4984c2c Create reproducible NOTICE collections
Sort the lists of notice files instead of relying on the filesystem
ordering returned by os.walk

Bug: 23972440
Change-Id: Id32be9ce8e540244ad9d67b6fc7883fc2963fe5c
2015-11-10 12:37:23 -08:00
Tao Bao
767e3ac246 releasetools: Refactor ota_from_target_files.py.
Factor out some common lines between generating incremental and full
OTAs. Remove the outer while loop for cleaner logic.

Change-Id: I0a4d44a4a59b488748222c2031bd63f67d45e0b5
2015-11-10 12:23:10 -08:00
Dan Willemsen
9956862b4b Add tool to diff two target files packages
This tool will help identify unexpected differences between two target
files packages. Expected changes (build number / date) are hidden, along
with known bugs.

It ignores anything that is just packaging for other files that are
already being diffed, like the recovery patching, and all of IMAGES/*

Bug 25372309

Change-Id: I4641754dd5dfbdfd3a89d8fa5262b9a9595e8e9c
2015-11-06 18:42:57 -08:00
Dan Willemsen
33e7b91442 Merge "Use explicitly sized types in zipalign/ziptime" am: 1b2685137e am: 163196aa48
am: 4ad4bd5817

* commit '4ad4bd58173e9ab6ab98e2112ce44ee1c45438ae':
  Use explicitly sized types in zipalign/ziptime
2015-11-06 03:27:57 +00:00
Dan Willemsen
163196aa48 Merge "Use explicitly sized types in zipalign/ziptime"
am: 1b2685137e

* commit '1b2685137ee9cde6ea24ff37b54c5d8e1ee18b01':
  Use explicitly sized types in zipalign/ziptime
2015-11-05 20:32:46 +00:00
Dan Willemsen
41bc424c32 Use explicitly sized types in zipalign/ziptime
getLongLE would return a 64-bit number with the upper 32-bits set when
decoding a 32-bit number with the top bit set. Per the zip file format,
it was only expected to return a 32-bit number. Use explicitly sized
types so that we use the proper sizes and don't do any implicit
extensions.

Change-Id: I5a4304dc99ce5f8f17284d4ca3094ae115207a1e
2015-11-04 23:52:52 +00:00
Clay Murphy
7579b1b06b Merge "Docs: Add Security tab to top" am: e47d8b99a2 am: 97b8e290b5
am: 50b167643f

* commit '50b167643fbe6391696095219e3a6a6f3004647a':
  Docs: Add Security tab to top
2015-11-04 00:07:07 +00:00
Clay Murphy
97b8e290b5 Merge "Docs: Add Security tab to top"
am: e47d8b99a2

* commit 'e47d8b99a2274b7689371685a819b5d1bf6e1cb1':
  Docs: Add Security tab to top
2015-11-03 23:56:54 +00:00
Clay Murphy
e47d8b99a2 Merge "Docs: Add Security tab to top" 2015-11-03 23:45:56 +00:00
Dan Willemsen
641e8888fa Merge "Remove changing uids/timestamps from zip/jar files" am: a0975edc16
am: c789be850c

* commit 'c789be850ca14b945e72412457991d7a5e13126e':
  Remove changing uids/timestamps from zip/jar files
2015-11-03 23:43:30 +00:00
Bill Yi
af05ad919a Merge commit '4f5e8cc3ca6da83f11bf42d04f1a57b9af16a582' into HEAD 2015-11-03 14:28:58 -08:00
Dan Willemsen
c789be850c Merge "Remove changing uids/timestamps from zip/jar files"
am: a0975edc16

* commit 'a0975edc164f4ff248882e660d95802eabd72fd4':
  Remove changing uids/timestamps from zip/jar files
2015-11-03 21:47:30 +00:00
Dan Willemsen
a0975edc16 Merge "Remove changing uids/timestamps from zip/jar files" 2015-11-03 21:38:45 +00:00
Dan Willemsen
48a621c277 Remove changing uids/timestamps from zip/jar files
Pass -X to zip so that Unix UID/GID and extra timestamps aren't
saved into the zip files.

Add a new tool, ziptime, that uses a very stripped down copy of
zipalign. It no longer depends on libandroidfw, and now rewrites the
timestamps in place instead of making a copy of the zipfile. This should
improve speed and reduce disk requirements, especially with the large
packaging zip files.

Bug: 24201956
Change-Id: I50f68669f659da1b4393e964ad40b6aafb00c1e7
2015-11-02 14:51:54 -08:00
Chris Palmer
49e300d54f Merge "Make URLs either HTTPS or protocol-relative." 2015-10-30 20:28:51 +00:00
Clay Murphy
2a0522b277 Docs: Add Security tab to top
Bug: 24908502
Change-Id: If3331bc4ba84a8694bc30cfa81d9dc080e93fa09
2015-10-29 15:19:06 -07:00
Dan Willemsen
5887bfbe20 Merge "Revert "Remove changing uids/timestamps from zip/jar files"" am: 49d8c5196e
am: d8d06da814

* commit 'd8d06da814fa02413bc3e58f3047f9a2ab61bb09':
  Revert "Remove changing uids/timestamps from zip/jar files"
2015-10-29 21:38:10 +00:00
Dan Willemsen
d8d06da814 Merge "Revert "Remove changing uids/timestamps from zip/jar files""
am: 49d8c5196e

* commit '49d8c5196eb690fc987673c27cb61087c5886be4':
  Revert "Remove changing uids/timestamps from zip/jar files"
2015-10-29 21:33:39 +00:00
Dan Willemsen
b589ae4e26 Revert "Remove changing uids/timestamps from zip/jar files"
This reverts commit 3c2c064c87.

zipalign depends on libandroidfw, and some setups don't include frameworks/base.

Bug: 24201956
Change-Id: I48ee95808924f6b2221f0a49ab205c2565096b1f
2015-10-29 21:26:18 +00:00
Dan Willemsen
aa851650bf Merge "Remove changing uids/timestamps from zip/jar files" am: 9f25219371
am: a51b1d532e

* commit 'a51b1d532e998c1668fd991f53c6619e02d9338a':
  Remove changing uids/timestamps from zip/jar files
2015-10-29 19:15:52 +00:00
Dan Willemsen
a51b1d532e Merge "Remove changing uids/timestamps from zip/jar files"
am: 9f25219371

* commit '9f252193714c82dbce702e8055ffaa7eec4afe66':
  Remove changing uids/timestamps from zip/jar files
2015-10-29 19:12:37 +00:00
Dan Willemsen
3c2c064c87 Remove changing uids/timestamps from zip/jar files
Pass -X to zip so that Unix UID/GID and extra timestamps aren't
saved into the zip files.

Add a new option to zipalign, -t, to replace all timestamps with static
timestamps (2008 Jan 1 00:00:00). Use this for all non-APK zip files.
APK zip timestamps are set based on the certificate date in SignApk.

Bug: 24201956
Change-Id: Ifb619fc499ba9d99fc624f2acd5f8de36d78ef8e
2015-10-29 11:57:16 -07:00
Tao Bao
b7e92cf344 Merge "Honor TARGET_NO_RECOVERY flag." am: c448e91c3d
am: e5eb4567d4

* commit 'e5eb4567d408808873d7193fcaf7bfea859ea725':
  Honor TARGET_NO_RECOVERY flag.
2015-10-29 16:49:53 +00:00
Sami Tolvanen
bc946c6521 Merge "Error correction: Use block_image_recover in block OTAs" am: fe4e86c7fd
am: a25cced65f

* commit 'a25cced65f3418b86ba7c3707f29838f4794f8b6':
  Error correction: Use block_image_recover in block OTAs
2015-10-29 16:49:37 +00:00
Tao Bao
e5eb4567d4 Merge "Honor TARGET_NO_RECOVERY flag."
am: c448e91c3d

* commit 'c448e91c3d3d095f8f200c9925f7db2ad525132f':
  Honor TARGET_NO_RECOVERY flag.
2015-10-29 16:45:31 +00:00
Sami Tolvanen
a25cced65f Merge "Error correction: Use block_image_recover in block OTAs"
am: fe4e86c7fd

* commit 'fe4e86c7fd1b9c8903fda194b8515451c477ced9':
  Error correction: Use block_image_recover in block OTAs
2015-10-29 16:45:14 +00:00
Tao Bao
c448e91c3d Merge "Honor TARGET_NO_RECOVERY flag." 2015-10-29 16:13:52 +00:00
Sami Tolvanen
f0a7c76b45 Error correction: Use block_image_recover in block OTAs
If block_image_verify fails, attempt to recover using FEC before giving up.

Bug: 21893453
Change-Id: Ibc1fe5d28b2a8099d2b5094277b572ec08229c3a
2015-10-29 11:39:31 +00:00
Ying Wang
4f5e8cc3ca Merge "Normalize the product makefile path in inherit-product." am: aabff90bfe
am: 3482ea54a2

* commit '3482ea54a2fecc756c79a94f37a66113d21d7558':
  Normalize the product makefile path in inherit-product.
2015-10-28 23:59:12 +00:00
Ying Wang
3482ea54a2 Merge "Normalize the product makefile path in inherit-product."
am: aabff90bfe

* commit 'aabff90bfe2312a95d3cf57564845fef8dc469a2':
  Normalize the product makefile path in inherit-product.
2015-10-28 23:55:10 +00:00