StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,488 Commits 1 Branch 0 Tags
8c8c8681805b51fd42c01cdf42ba19e74ef72e52
Commit Graph

3302 Commits

Author SHA1 Message Date
Colin Cross
8b63d67e1b Merge changes I2ba90314,I5f47307d 
am: fc8b331858

* commit 'fc8b331858747f8207e3861c0ada2c4fd359f648':
  makeparallel: prepend flags to ninja command line
  Put NINJA_ARGS last
 2015-10-21 00:21:52 +00:00
Colin Cross
466ea35202 makeparallel: prepend flags to ninja command line 
Ninja stops parsing top level options after -t is used to select a
tool.  Put any inserted command line options at the beginning of the
command.

Change-Id: I2ba903143366aaded63e21d749476248617c8962
 2015-10-20 17:05:49 -07:00
Sami Tolvanen
58a748d37e am 87f58261: Merge "Error correction: Append codes to verified partitions" 
* commit '87f582611a5a5c23abf3237abe0e467e46111567':
  Error correction: Append codes to verified partitions
 2015-10-19 02:55:51 -07:00
Sami Tolvanen
87f582611a Merge "Error correction: Append codes to verified partitions" 2015-10-19 09:49:18 +00:00
Ying Wang
cd9545a499 am 4f6f0f92: Merge "If a console doesn\'t exist, read password from stdin." 
* commit '4f6f0f924eba9f80493861a9e7ff7f40f9924aa2':
  If a console doesn't exist, read password from stdin.
 2015-10-18 10:12:27 -07:00
Ying Wang
4f6f0f924e Merge "If a console doesn't exist, read password from stdin." 2015-10-18 17:07:28 +00:00
Tao Bao
6ce8ae761b am ac39bef4: Merge "common.py: Fix the build." 
* commit 'ac39bef43fb032bff75b8558f54107e733355265':
  common.py: Fix the build.
 2015-10-16 15:46:31 -07:00
Tao Bao
aac4ad56b6 common.py: Fix the build. 
Should only use source_info_dict when creating incremental OTAs.

Change-Id: I6a4e5f8fa3613a1b36563ec915e433247965a2b8
 2015-10-16 15:28:00 -07:00
Tao Bao
63e63c2a07 am 543b28d4: Merge "Pass source\'s info_dict to vendor\'s releasetools.py." 
* commit '543b28d42f8fdebe011a906826251ab8df70a226':
  Pass source's info_dict to vendor's releasetools.py.
 2015-10-16 14:49:40 -07:00
Sami Tolvanen
f99b53143d Error correction: Append codes to verified partitions 
Append error-correcting codes to verified partitions provided that
PRODUCT_SUPPORTS_VERITY_FEC is true.

This moves verity metadata to be after the hash tree, and requires
matching changes from
  Ide48f581bbba77aed6132f77b309db71630d81ed

Bug: 21893453
Change-Id: I6945cbab99e214566a1f9d3702333f2dbbc35816
 2015-10-14 18:06:20 +01:00
Tao Bao
6f0b219ac5 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.

Bug: 24898607
Change-Id: Ie2973d41b905637862616286663baf80df83bd88
 2015-10-13 16:38:36 -07:00
Tao Bao
128f01cf58 am ce9635ec: am 2124d7e1: Merge "Only use a fixed timestamp when packaging." 
* commit 'ce9635ec7ad6bcc6b9bc74136edb91847fe9e4ff':
  Only use a fixed timestamp when packaging.
 2015-10-01 00:00:06 +00:00
Tao Bao
ce9635ec7a am 2124d7e1: Merge "Only use a fixed timestamp when packaging." 
* commit '2124d7e1e2dec91ce4ab15c6a215d61f7693a8d6':
  Only use a fixed timestamp when packaging.
 2015-09-30 23:50:49 +00:00
Tao Bao
822f5840c0 Only use a fixed timestamp when packaging. 
[1] changed to use a fixed timestamp for all the generated images
(either the one under $ANDROID_PRODUCT_OUT/ or the one added into the
target_files zip). It makes 'adb sync' after 'fastboot flashall' to
resync all the files. This CL changes to use a fixed timestamp only when
packaging into the target_files zip.

[1]: commit 052ae3542b

Bug: 24377993
Bug: 24536411
Change-Id: I209318966109fd4902468dfe96caf777464f9fe1
 2015-09-30 16:01:14 -07:00
Tao Bao
5b8bd02ed4 am 9a5afa52: am 5e23069b: Merge "build_image.py: Use a fixed timestamp in the generated image." 
* commit '9a5afa5242a4d179fc45f59944c0fba5ccaa4c15':
  build_image.py: Use a fixed timestamp in the generated image.
 2015-09-28 21:24:38 +00:00
Tao Bao
9a5afa5242 am 5e23069b: Merge "build_image.py: Use a fixed timestamp in the generated image." 
* commit '5e23069bceebfbf17f67c709bad495d707b194dc':
  build_image.py: Use a fixed timestamp in the generated image.
 2015-09-28 21:16:34 +00:00
Tao Bao
052ae3542b build_image.py: Use a fixed timestamp in the generated image. 
Bug: 24377993
Change-Id: I9b1433c8c877dc2a391615bb016b8970426e9f70
 2015-09-28 13:44:13 -07:00
adattatr
50c7c5a722 If a console doesn't exist, read password from stdin. 
When signapk.jar is invoked by scripts like
sign_target_files_apks.py, there is no console as signapk is
invoked using popen(). To support signing of APKs using
software keys with passwords, we need to read
the password from stdin if there is no console.

Change-Id: Icf69ba1e58bf1f91979eaf1d3b91cb202782e8fd
Signed-off-by: adattatr <anisha.dattatraya.kulkarni@intel.com>
Signed-off-by: Brad Geltz <brad.geltz@intel.com>
 2015-09-28 11:44:27 -07:00
Tao Bao
c41dc0ad1a am 251d56b8: Merge "releasetools: Update the fingerprint when signing." 
* commit '251d56b851af2159df8139639b4a1a1602d60163':
  releasetools: Update the fingerprint when signing.
 2015-09-25 21:14:17 +00:00
Tao Bao
cb7ff77da5 releasetools: Update the fingerprint when signing. 
ro.bootimage.build.fingerprint should be updated when signing.

Bug: 22720426
Bug: 24009888
Change-Id: Ib246a257581fd31f90ad6b3d21f39d1a2de24ba8
(cherry picked from commit 265d9aeb62)
 2015-09-25 12:41:34 -07:00
Colin Cross
7f908a438b am a084f2c7: am 0881ce18: Merge changes Ic1be7572,Id6481430 
* commit 'a084f2c73b905ab4906eb5e7aad593bd6fa222e6':
  Pass --ninja to makeparallel for ninja
  makeparallel: improve support for wrapping ninja
 2015-09-19 19:59:59 +00:00
Colin Cross
a084f2c73b am 0881ce18: Merge changes Ic1be7572,Id6481430 
* commit '0881ce1817395d62d2746a14350767bf411f89d4':
  Pass --ninja to makeparallel for ninja
  makeparallel: improve support for wrapping ninja
 2015-09-19 19:52:44 +00:00
Colin Cross
69047fab7e makeparallel: improve support for wrapping ninja 
Allow makeparallel to pass better -j and -k arguments to ninja if the
first argument to makeparallel is --ninja.  Uses getopt to parse
MAKEFLAGS to get values for --jobserver-fds, -k, and -j, and uses the
result to not pass any -j argument to ninja for make -j with no number,
and pass -k0 to ninja for make -k.

Also improve the test makefile to provide many more tests.

Bug: 24199503
Change-Id: Id6481430f77e9e952213be58a98fe78c46ee5d6a
 2015-09-18 15:02:40 -07:00
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