StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,052 Commits 1 Branch 0 Tags
12ab99be0985cd22890e8f75f5e9f95aa1e2c981
Commit Graph

3279 Commits

Author SHA1 Message Date
Baligh Uddin
12ab99be09 am aa3d37a1: am 5790d54a: am 59f4ff10: Add verity_signer and verity_key flags to add_img_to_target_files. 
* commit 'aa3d37a1d704ab9204de7d76dca784c9b17bd2ee':
  Add verity_signer and verity_key flags to add_img_to_target_files.
 2015-09-17 05:01:26 +00:00
Baligh Uddin
5790d54ab8 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.
 2015-09-17 04:46:21 +00:00
Baligh Uddin
59f4ff109d 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
 2015-09-16 21:20:30 -07:00
Ian Pedowitz
2029791350 resolved conflicts for f4fc29b0 to mnc-dr-dev-plus-aosp 
Change-Id: Ieee6621881ace1631ae53d2a5879c271ba45382f
 2015-09-15 19:18:15 -07:00
Ian Pedowitz
b00f80cc65 am a0abf49d: resolved conflicts for a1fcaf86 to mnc-dr-dev 
* commit 'a0abf49d2bdc42c81e5f636e54da9038de9dfc21':
  Add an option to include a full bootloader in incremental OTA.
 2015-09-16 01:48:58 +00:00
Ian Pedowitz
a0abf49d2b resolved conflicts for a1fcaf86 to mnc-dr-dev 
Change-Id: Ie53652faa530a3c9c83f30c8f2b636d90f0f1b7a
 2015-09-15 18:39:19 -07:00
leozwang
a1fcaf86c4 Add an option to include a full bootloader in incremental OTA. 
Bug: 23999213
Change-Id: I6c715eb01048e187622ba1e90c89a3306a294b8a
 2015-09-15 08:44:12 -07:00
leozwang
5f37367d7d am 34863c69: am d0c8ef98: am 1e7f6f74: Fix build. 
* commit '34863c6989c0df7ba6c31d0f70804728c4ad69af':
  Fix build.
 2015-09-15 09:53:14 +00:00
leozwang
d0c8ef989e am 1e7f6f74: Fix build. 
* commit '1e7f6f7442ca2addc8e4447d3070c625dbba8d3f':
  Fix build.
 2015-09-15 07:57:43 +00:00
leozwang
91c8c66eb0 am 17aa06f6: Fix build. 
* commit '17aa06f6fe0c10cb3bb84a11dfc78a88a4155adc':
  Fix build.
 2015-09-15 07:52:08 +00:00
leozwang
1e7f6f7442 Fix build. 
Convert ota_from_target_files back to symbolic link.

Change-Id: I932ba8c0b15fa71a27083adc92e9f9a90dc82f8c
(cherry picked from commit 17aa06f6fe)
 2015-09-15 07:50:10 +00:00
leozwang
17aa06f6fe Fix build. 
Convert ota_from_target_files back to symbolic link.

Change-Id: I932ba8c0b15fa71a27083adc92e9f9a90dc82f8c
 2015-09-15 00:41:53 -07:00
Leo Wang
684b234ddf am 6570b1e6: am 0cec840c: am 888b6f47: am 47f6a4e7: am 1c1a6d15: am 2c9dfb82: am 1d4ad515: Revert "Add an option to include a full bootloader in incremental OTA." 
* commit '6570b1e6373e709e01fc91fd7589abeb0a4d4c01':
  Revert "Add an option to include a full bootloader in incremental OTA."
 2015-09-15 05:11:26 +00:00
Leo Wang
0cec840cbc 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."
 2015-09-15 04:58:06 +00:00
Leo Wang
888b6f47c7 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."
 2015-09-15 04:51:19 +00:00
Leo Wang
47f6a4e725 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."
 2015-09-15 04:43:38 +00:00
Leo Wang
1c1a6d15b2 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."
 2015-09-15 04:36:53 +00:00
Leo Wang
2c9dfb8239 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."
 2015-09-15 04:29:45 +00:00
Leo Wang
1d4ad5158b Revert "Add an option to include a full bootloader in incremental OTA." 
This reverts commit 46d5efcd0d.

Change-Id: Ibd347be362db50c0cdb34bf828718872bd74ad56
 2015-09-15 04:03:20 +00:00
leozwang
ffa5b08178 am 89cd35ab: am fd5330c0: am 160603cf: am 5837f102: am 1753b4e9: resolved conflicts for 00fdede3 to lmp-mr1-ub-dev 
* commit '89cd35ab823fc549072aed41dd44cce5886e3d06':
  Add an option to include a full bootloader in incremental OTA.
 2015-09-15 02:12:35 +00:00
leozwang
fd5330c057 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.
 2015-09-15 01:24:53 +00:00
leozwang
160603cfc2 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.
 2015-09-15 01:17:03 +00:00
leozwang
5837f1025c am 1753b4e9: resolved conflicts for 00fdede3 to lmp-mr1-ub-dev 
* commit '1753b4e9e444d9ce57f5ce481ed5e3317670ee31':
  Add an option to include a full bootloader in incremental OTA.
 2015-09-15 01:07:05 +00:00
Colin Cross
b690d4e955 am e173cb8b: am 4ce3cea7: Merge changes I6e4f957c,Id41a2d81 
* commit 'e173cb8b38ab2ac8eb1b5373eb2987516aacdeb3':
  Use makeparallel to propagate -j flag to ninja or kati
  Implement makeparallel
 2015-09-15 00:30:41 +00:00
Colin Cross
e173cb8b38 am 4ce3cea7: Merge changes I6e4f957c,Id41a2d81 
* commit '4ce3cea77065396b81a4e50283b785e9cc64788f':
  Use makeparallel to propagate -j flag to ninja or kati
  Implement makeparallel
 2015-09-15 00:25:06 +00:00
leozwang
1753b4e9e4 resolved conflicts for 00fdede3 to lmp-mr1-ub-dev 
Change-Id: If4b79f7ed4d67cd8ed708a84703eac58b1e979ac
 2015-09-14 16:39:23 -07:00
Colin Cross
a55544875a Implement makeparallel 
makeparallel communicates with the GNU make jobserver
(http://make.mad-scientist.net/papers/jobserver-implementation/)
in order claim all available jobs, and then passes the number of jobs
claimed to a subprocess with -j<jobs>.

Change-Id: Id41a2d81e0d835517da8ba52c818c763fc455c14
 2015-09-14 14:33:50 -07:00
leozwang
00fdede320 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.
 2015-09-14 21:27:04 +00:00
leozwang
46d5efcd0d Add an option to include a full bootloader in incremental OTA. 
Bug: 23101469
Bug: 23999213

Change-Id: Id5ed748a5639663bb5df954f9375838fd9c295ca
 2015-09-14 10:41:34 -07:00
Tao Bao
2acb582a83 am fdd713fa: am fbecca31: am e35d00d0: am 265d9aeb: releasetools: Update the fingerprint when signing. 
* commit 'fdd713fa78b589eb89dc9c02d34af2148f24afe8':
  releasetools: Update the fingerprint when signing.
 2015-09-12 23:21:25 +00:00
Tao Bao
fbecca3143 am e35d00d0: am 265d9aeb: releasetools: Update the fingerprint when signing. 
* commit 'e35d00d019aaff92b5e20b86d9c3b8222c0c946a':
  releasetools: Update the fingerprint when signing.
 2015-09-12 23:07:41 +00:00
Tao Bao
e35d00d019 am 265d9aeb: releasetools: Update the fingerprint when signing. 
* commit '265d9aeb622c5829787b16b903f028cacaa99c18':
  releasetools: Update the fingerprint when signing.
 2015-09-12 23:00:24 +00:00
Tao Bao
265d9aeb62 releasetools: Update the fingerprint when signing. 
ro.bootimage.build.fingerprint should be updated when signing.

Bug: 22720426
Bug: 24009888
Change-Id: I5bd31858c6bc31edcecc6f5248f4274481506288
 2015-09-11 16:47:28 -07:00
Tao Bao
8cb50e052f am e0540445: am c5fe3f11: Merge "releasetools: Fix the expected total blocks." 
* commit 'e0540445e3d5d7bd5439312a60aa0c467bae1b39':
  releasetools: Fix the expected total blocks.
 2015-09-09 19:44:37 +00:00
Tao Bao
e0540445e3 am c5fe3f11: Merge "releasetools: Fix the expected total blocks." 
* commit 'c5fe3f117d79ed9ddb6e77fbf211a87dc5dffed4':
  releasetools: Fix the expected total blocks.
 2015-09-09 19:39:40 +00:00
Tao Bao
b32d56ea8c releasetools: Fix the expected total blocks. 
With the change in [1], it zeroes out extra blocks that might be read
by dm-verity. We should update the expected number of blocks that get
touched.

[1] commit e9b619108d.

Bug: 23786644
Change-Id: I7a7c3531e5af6bf381d3a14832e77abfa9a8efce
 2015-09-09 11:56:58 -07:00
Tao Bao
484617a79a am 5ffff55b: am 10b2e62b: Merge "releasetools: Don\'t write empty groups." 
* commit '5ffff55bbd5770dfc3e7586396c326f97c7b2b47':
  releasetools: Don't write empty groups.
 2015-09-08 22:38:35 +00:00
Tao Bao
5ffff55bbd am 10b2e62b: Merge "releasetools: Don\'t write empty groups." 
* commit '10b2e62b6d45dc4b406be1544fd9b25d6f800e89':
  releasetools: Don't write empty groups.
 2015-09-08 22:33:16 +00:00
Tao Bao
42206c3f2f releasetools: Don't write empty groups. 
For a DataImage, we may have no mapping of ZERO or NONZERO blocks. Don't
write those groups if they are empty.

Bug: 19024504
Change-Id: I1e921effcdbf0661d4f4b541c104dd456ac0c582
 2015-09-08 14:06:08 -07:00
Tao Bao
8eb3ac18ad am 28f6f9c3: releasetools: Always write the last block if it\'s padded. 
* commit '28f6f9c3deb4d23fd627d15631d682a5cfa989fc':
  releasetools: Always write the last block if it's padded.
 2015-09-08 20:30:51 +00:00
Tao Bao
00f3c89fd4 rangelib.py: Remove the obsolete comment line. 
It was supposed to be removed in [1], but still exists for unknown
reason.

[1]: commit e8f756137c

Change-Id: Ic51e14085294495ec390bbf3cbe8c4fb6e97b860
 2015-09-08 12:08:24 -07:00
Tao Bao
4748de05f0 am 102ffce5: am 16656668: Merge "releasetools: Always write the last block if it\'s padded." 
* commit '102ffce5dc9aefa6da39e3d91b7c7acf071a302b':
  releasetools: Always write the last block if it's padded.
 2015-09-08 17:58:44 +00:00
Tao Bao
28f6f9c3de 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 7589e961a7)
 2015-09-08 10:55:32 -07:00
Tao Bao
102ffce5dc am 16656668: Merge "releasetools: Always write the last block if it\'s padded." 
* commit '16656668e1cca5b62ca4487206c462b93bf5a0fc':
  releasetools: Always write the last block if it's padded.
 2015-09-08 17:50:25 +00:00
Tao Bao
7589e961a7 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: I4b0af7344d18261258cd48d18c029c089d6ff365
 2015-09-05 20:54:55 -07:00
Tao Bao
276a4f4512 am 2f44006a: am 8f4b307e: Merge "releasetools: Fix the bug when deleting files." 
* commit '2f44006a4bbfe6eb7af4d69a24bd068a0875a304':
  releasetools: Fix the bug when deleting files.
 2015-09-04 18:02:30 +00:00
Tao Bao
2f44006a4b am 8f4b307e: Merge "releasetools: Fix the bug when deleting files." 
* commit '8f4b307e56ea73153f249b44dc2b15de77e058f7':
  releasetools: Fix the bug when deleting files.
 2015-09-04 17:56:22 +00:00
Tao Bao
8f4b307e56 Merge "releasetools: Fix the bug when deleting files." 2015-09-04 17:05:55 +00:00
Tao Bao
a77d41e2f7 releasetools: Fix the bug when deleting files. 
For file-based OTAs, we used to remove unneeded files in ascending
order, which failed to delete non-empty directories. Reverse the order
to fix the issue.

For example, now we have the following in our generated script:
  delete("/system/app/Calculator/arm/Calculator.odex",
         "/system/app/Calculator/arm/",
         "/system/app/Calculator/Calculator.apk",
         "/system/app/Calculator/");

Bug: 22960996
Change-Id: I0d36d29b7862fb53bf55bf5685a990180f9c0b3b
 2015-09-03 21:21:55 -07:00
Dan Willemsen
1205f2d953 am f18345af: am 4379e2b8: Merge "Add LOCAL_MODULE_HOST_OS" 
* commit 'f18345af74ad00d057adad89b1d154471ebf118f':
  Add LOCAL_MODULE_HOST_OS
 2015-09-04 01:39:49 +00:00