Commit Graph

1303 Commits

Author SHA1 Message Date
Lee Campbell 04ba31236e build: Add extra build customization for /product
This makes /product more consistent with /device & /vendor

BUG: 22030305

Change-Id: Ic65bfde7fb3e9fab8c8fb8d99af15404574abde0
2015-11-02 14:18:13 -08:00
Ying Wang 4e8e26819e Merge "Add _asan suffix to ro.build.flavor for ASAN builds." am: f0a8dd43b2 am: cce30b6daa
am: 5d95b4aa93

* commit '5d95b4aa935e37fee0f68a97953c6e440974af0d':
  Add _asan suffix to ro.build.flavor for ASAN builds.
2015-11-02 20:01:16 +00:00
Ying Wang 8ef7a895da Merge "Fix "make product-graph" and "make dump-products"." am: 888f30aa44 am: 603e4ed594
am: 6a019f1d2e

* commit '6a019f1d2ec88baeaa5c95c76ea966e562bdfa3a':
  Fix "make product-graph" and "make dump-products".
2015-11-02 20:01:10 +00:00
Ying Wang cce30b6daa Merge "Add _asan suffix to ro.build.flavor for ASAN builds."
am: f0a8dd43b2

* commit 'f0a8dd43b26d49ad67e2c6c8c936e64a62df8582':
  Add _asan suffix to ro.build.flavor for ASAN builds.
2015-11-02 19:52:04 +00:00
Ying Wang 603e4ed594 Merge "Fix "make product-graph" and "make dump-products"."
am: 888f30aa44

* commit '888f30aa448370206a49ff7df940e134b8ff7017':
  Fix "make product-graph" and "make dump-products".
2015-11-02 19:51:57 +00:00
Ying Wang f0a8dd43b2 Merge "Add _asan suffix to ro.build.flavor for ASAN builds." 2015-11-02 19:47:31 +00:00
Ying Wang 888f30aa44 Merge "Fix "make product-graph" and "make dump-products"." 2015-11-02 19:46:53 +00:00
Dan Willemsen bfaf0f7830 Merge "Revert "Remove changing uids/timestamps from zip/jar files"" am: 49d8c5196e am: d8d06da814
am: 5887bfbe20

* commit '5887bfbe203d47849993b3cdbe54d6f0a155a071':
  Revert "Remove changing uids/timestamps from zip/jar files"
2015-10-29 21:42:07 +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 81e5f37786 Merge "Remove changing uids/timestamps from zip/jar files" am: 9f25219371 am: a51b1d532e
am: aa851650bf

* commit 'aa851650bf73d8143da011013bd64cd49969be96':
  Remove changing uids/timestamps from zip/jar files
2015-10-29 19:20:55 +00:00
Tao Bao a76a06e05e Merge "Honor TARGET_NO_RECOVERY flag." am: c448e91c3d am: e5eb4567d4
am: b7e92cf344

* commit 'b7e92cf344c54af39d44905d5d8a4d9d79f6a5c4':
  Honor TARGET_NO_RECOVERY flag.
2015-10-29 19:20:49 +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 e5eb4567d4 Merge "Honor TARGET_NO_RECOVERY flag."
am: c448e91c3d

* commit 'c448e91c3d3d095f8f200c9925f7db2ad525132f':
  Honor TARGET_NO_RECOVERY flag.
2015-10-29 16:45:31 +00:00
Ying Wang 21ec03d186 Add _asan suffix to ro.build.flavor for ASAN builds.
Bug: 25344475
Change-Id: I27f2472906631239ca725ee09da2ab791cad2195
2015-10-28 18:47:00 -07:00
Ying Wang 67132baa4d Fix "make product-graph" and "make dump-products".
- For unmodified "make product-graph" and "make dump-products",
  load only the current product configuration makefiles. This is much
  faster than loading all product makefiles.
- For "make product-graph ANDROID_PRODUCT_GRAPH=--all",
  "make dump-products ANDROID_DUMP_PRODUCTS=all", load all product
  makefiles.
- Move product-graph.mk out of build tasks, so we can skip loading all
  the Android.mks, which takes long and we don't really need them.
  More importantly, with all product makefiles loaded, modules in
  Android.mks are prone to clash (if they are conditionally included
  by variables set up in product makefiles) and lead to parse-time
  error.

Change-Id: Idc1d6b0c23eb2c8bb34fdd7a1fa4d56171768d21
2015-10-28 16:49:44 -07:00
Tao Bao db45efa647 Honor TARGET_NO_RECOVERY flag.
Don't generate recovery.img when calling 'make dist' if
TARGET_NO_RECOVERY is set. The build system passes the flag to the
packaging script which then generates recovery.img conditionally.

Bug: 25329471
Change-Id: Ifbc999300d5c31e897878f81e231ae7dd2aca660
2015-10-27 20:00:10 -07:00
Tao Bao a9887d52b7 Merge "Bump up the BBOTA version to 4." am: ac4ec1a4ea am: ada3927e53
am: 5ddc4ac802

* commit '5ddc4ac8028e1bfdf0f2cb3ea6b80762c73cd281':
  Bump up the BBOTA version to 4.
2015-10-23 18:55:16 +00:00
Tao Bao ada3927e53 Merge "Bump up the BBOTA version to 4."
am: ac4ec1a4ea

* commit 'ac4ec1a4ea83a150e08ccd43f30fe34de52cdebf':
  Bump up the BBOTA version to 4.
2015-10-23 18:45:35 +00:00
Tao Bao eba409c4da Bump up the BBOTA version to 4.
To accommodate new changes (such as error correction in [1]) to BBOTA
in N release. We bump up the version to keep the OTA script backward
compatible.

Needs the matching CL in commit
1fdec8685af858c5ff4f45d2e3059186ab5ed2ab.

[1]: commit 0a7b47397db3648afe6f3aeb2abb175934c2cbca

Change-Id: Ib9158b455cd5905fe2d4742ce81feb1b7583054f
2015-10-23 10:45:36 -07:00
Alex Deymo 7489b59905 Merge "Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS." am: c82b873b9b am: 7410ed86c6
am: 47d31960d5

* commit '47d31960d5ea013e049ed3548c7dd5445caae6a6':
  Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.
2015-10-23 14:54:49 +00:00
Alex Deymo 7410ed86c6 Merge "Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS."
am: c82b873b9b

* commit 'c82b873b9b6c234da128cdbc0dde6624e45f5b6d':
  Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.
2015-10-23 14:48:30 +00:00
Alex Deymo 49be2b115c Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.
In order to have all the A/B updater variables in the same AB_OTA_
namespace we rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.

Bug: None
Test: `make dist` includes the partitions.txt file if properly configured.

Change-Id: Ied4faabd7e2f0ab8a5007afb44ad2f38df8d630d
2015-10-22 18:17:36 -07:00
Sami Tolvanen a749f91191 am 6a14ba31: am 58a748d3: am 87f58261: Merge "Error correction: Append codes to verified partitions"
* commit '6a14ba317cea22f16db3bb76cb818fd7322b8253':
  Error correction: Append codes to verified partitions
2015-10-19 10:07:21 +00: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
Steve Fung f2a3fd5d98 am 31ba99b9: am a6968d8f: am 2af58637: Merge "Add the Product ID to target_files.zip"
* commit '31ba99b9e279b588b584ed90cfc1ca9cc04855cd':
  Add the Product ID to target_files.zip
2015-10-15 18:35:57 +00:00
Steve Fung a6968d8f1d am 2af58637: Merge "Add the Product ID to target_files.zip"
* commit '2af586376d2b99c75a5672c72a704f2031adc0fe':
  Add the Product ID to target_files.zip
2015-10-15 18:19:52 +00:00
Steve Fung 22d624a904 Add the Product ID to target_files.zip
When using the A/B updater, include the product id string to
target_files.zip.
This is needed by the Omaha backend.

Bug: 24946811
Change-Id: I2ce5f6cffe440c29a1820348ee215c71cec07861
2015-10-14 15:56:50 -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
Bertrand Simonnet dc3f1214d9 am 123b060f: am 5df7366e: am f698ca63: Merge "Add the product version to target_files.zip."
* commit '123b060f042349f64e336b5202dc1e2d92e262fd':
  Add the product version to target_files.zip.
2015-10-13 20:22:10 +00:00
Bertrand Simonnet 5df7366e12 am f698ca63: Merge "Add the product version to target_files.zip."
* commit 'f698ca63d970e1ed7f9b5c4090d2cf5cfa659e55':
  Add the product version to target_files.zip.
2015-10-13 20:08:37 +00:00
Bertrand SIMONNET 4af7259c2d Add the product version to target_files.zip.
When using the A/B updater, include the product version string to
target_files.zip.
This is needed by the Omaha backend.

BUG: 24743570
Change-Id: Idaba06624c1de452b1e1f9d3ebec851229af987a
2015-10-08 16:10:04 -07:00
Steve Fung 255c390559 am a9722e29: am 9782fc4c: am 46fbaa56: Merge "Exclude OTA/bin tools when using A/B OTA updater"
* commit 'a9722e29278710c32d84604fd338a4e05ebbb320':
  Exclude OTA/bin tools when using A/B OTA updater
2015-10-03 02:05:31 +00:00
Steve Fung a9722e2927 am 9782fc4c: am 46fbaa56: Merge "Exclude OTA/bin tools when using A/B OTA updater"
* commit '9782fc4cddac3e31e1e08b1ec86fc61c84a943ec':
  Exclude OTA/bin tools when using A/B OTA updater
2015-10-03 02:02:38 +00:00
Steve Fung 9782fc4cdd am 46fbaa56: Merge "Exclude OTA/bin tools when using A/B OTA updater"
* commit '46fbaa564071e682e3cef7580723249af153ca71':
  Exclude OTA/bin tools when using A/B OTA updater
2015-10-03 01:55:34 +00:00
Steve Fung 48e49f592f Exclude OTA/bin tools when using A/B OTA updater
The OTA/bin tools are not needed in the target files zip when using
the A/B OTA updater.

Bug: 24577767
Change-Id: I7938a906e4d73709aaa944e8065f922536072e27
2015-10-02 17:23:14 -07:00
Alex Deymo 4d387d00f0 am f9bd3d82: am 35907067: am e89dd69c: Merge "Pack META/ab_partitions.txt when using the A/B OTA updater."
* commit 'f9bd3d82f1a6451fc9c1f7e3a4017bdc1d13bc58':
  Pack META/ab_partitions.txt when using the A/B OTA updater.
2015-10-02 03:57:48 +00:00
Alex Deymo f9bd3d82f1 am 35907067: am e89dd69c: Merge "Pack META/ab_partitions.txt when using the A/B OTA updater."
* commit '3590706735ac41b6956ef07de20cac3994a046f2':
  Pack META/ab_partitions.txt when using the A/B OTA updater.
2015-10-02 03:52:50 +00:00
Alex Deymo 3590706735 am e89dd69c: Merge "Pack META/ab_partitions.txt when using the A/B OTA updater."
* commit 'e89dd69c7632e23bf1cf7db5be1cf1b0f6f345f8':
  Pack META/ab_partitions.txt when using the A/B OTA updater.
2015-10-02 03:46:07 +00:00
Alex Deymo 8925d334c3 Pack META/ab_partitions.txt when using the A/B OTA updater.
The list of A/B partitions updated is product-specific. Normally you
would update boot and system, but the product could require to update
other partitions during a system update. This patch packages the list
of A/B partitions configured to be updated when using the A/B updater.
The list can be set in the product makefile by setting the make
variable UPDATE_AB_PARTITIONS.

Bug: 24387863
Test: `make dist` creates the META/ab_partitions.txt in the target_files.zip

Change-Id: I4226ab05c7c7cd74721b06f1da64c6cf4d0e52ac
2015-10-01 19:31:18 -07:00
Alex Deymo 33e07c993e am 48ab56c5: am dbfe5a7e: am 06ba28c3: Merge "Pack the update_engine_config.txt when using the A/B OTA updater."
* commit '48ab56c5cda3d35f885ae50ac2d20567c28ab203':
  Pack the update_engine_config.txt when using the A/B OTA updater.
2015-09-30 20:24:17 +00:00
Alex Deymo 48ab56c5cd am dbfe5a7e: am 06ba28c3: Merge "Pack the update_engine_config.txt when using the A/B OTA updater."
* commit 'dbfe5a7ecb3d891201ffcb255d4d6af62b5d07ff':
  Pack the update_engine_config.txt when using the A/B OTA updater.
2015-09-30 20:16:46 +00:00
Alex Deymo dbfe5a7ecb am 06ba28c3: Merge "Pack the update_engine_config.txt when using the A/B OTA updater."
* commit '06ba28c31e9bea93ae3e3994bfe766a0a4a0073e':
  Pack the update_engine_config.txt when using the A/B OTA updater.
2015-09-30 20:10:45 +00:00
Alex Deymo 70067acd66 Pack the update_engine_config.txt when using the A/B OTA updater.
This config file pulled directly from the source specifies the update
payload version supported by the code. When generating an incremental
update payload for the A/B updater, the generated payload format will
match the version supported by the old version.

Bug: 24406755
Test: `make dist` on Brillo.

Change-Id: Ib7ac6828d0d34eb31e786dbaae5d59ecf26c3576
2015-09-30 09:54:36 -07:00
Tao Bao 863ae6e6dd am 54fee2c4: am 5bd910a5: am 7e9b4ec4: Merge "Pack libdivsufsort.so into otatools.zip."
* commit '54fee2c40761d7636f960afe07b4d28a5cf01ddd':
  Pack libdivsufsort.so into otatools.zip.
2015-09-29 17:53:50 +00:00
Tao Bao 54fee2c407 am 5bd910a5: am 7e9b4ec4: Merge "Pack libdivsufsort.so into otatools.zip."
* commit '5bd910a56e90025539abe432e01c72f3bea15a2d':
  Pack libdivsufsort.so into otatools.zip.
2015-09-29 17:47:49 +00:00
Tao Bao 5bd910a56e am 7e9b4ec4: Merge "Pack libdivsufsort.so into otatools.zip."
* commit '7e9b4ec44c63cb2e89388250aa6547aa6eddcab8':
  Pack libdivsufsort.so into otatools.zip.
2015-09-29 17:42:44 +00:00
Tao Bao f6d83021d4 Pack libdivsufsort.so into otatools.zip.
This is to support the change to bsdiff which depends on
libdivsufsort.so and libdivsufsort64.so now.

Bug: 24332905
Change-Id: I232fc1b2abda67456f012a83fa4f69a99bc6ea14
2015-09-28 16:42:51 -07:00
Steve Fung c8adb6cbb8 am 6a6f1850: am db4cba4a: am 562ad0b5: Merge "Package breakpad symbols in target files zip"
* commit '6a6f18506900c67f822cbc7523c04ea6e0a45e72':
  Package breakpad symbols in target files zip
2015-09-28 20:37:07 +00:00
Steve Fung 6a6f185069 am db4cba4a: am 562ad0b5: Merge "Package breakpad symbols in target files zip"
* commit 'db4cba4a084c545e692c324abe26be33b0c3434b':
  Package breakpad symbols in target files zip
2015-09-28 20:30:51 +00:00
Steve Fung db4cba4a08 am 562ad0b5: Merge "Package breakpad symbols in target files zip"
* commit '562ad0b5e4f5d49fc62e72ca1d6eb18acab6e90b':
  Package breakpad symbols in target files zip
2015-09-28 20:24:32 +00:00
Steve Fung dfbab49bed Package breakpad symbols in target files zip
When BREAKPAD_GENERATE_SYMBOLS is set to true, package the breakpad
symbols into the target files zip thats generated with `make dist`.

Bug: 24165970
Change-Id: I11c0d9a9d9e159475bfdb7bc338f9e9ac60aeada
2015-09-25 18:34:15 -07:00
Ying Wang c67c548ecd am f0f8bc21: am d6679fbc: am 9412efdc: Merge "Don\'t build otatools.zip if we don\'t build the ota package."
* commit 'f0f8bc2118a96a2b929e1bae5e3154cb846b6a4f':
  Don't build otatools.zip if we don't build the ota package.
2015-09-22 20:57:42 +00:00
Ying Wang f0f8bc2118 am d6679fbc: am 9412efdc: Merge "Don\'t build otatools.zip if we don\'t build the ota package."
* commit 'd6679fbc7e3fdafa4b8b2f554f5f53fef00af696':
  Don't build otatools.zip if we don't build the ota package.
2015-09-22 18:56:57 +00:00
Ying Wang d6679fbc7e am 9412efdc: Merge "Don\'t build otatools.zip if we don\'t build the ota package."
* commit '9412efdc1b9f54e1bc8df3ea3e8e34b7d899cc70':
  Don't build otatools.zip if we don't build the ota package.
2015-09-22 18:50:52 +00:00
Ying Wang bd2d024778 Don't build otatools.zip if we don't build the ota package.
Also added flag TARGET_SKIP_OTA_PACKAGE to allow product to skip ota
package.

Bug: 24295339
Change-Id: Ib613ed747528661a6572b577cd54ccb6c2d1fdc8
2015-09-22 11:41:59 -07:00
Zach Jang f694d37895 resolved conflicts for b161297d to lmp-mr1-ub-dev
Change-Id: I9bfac79b7d0cc7c6a3e501b15d5bd91781e6246e
2015-09-21 13:00:04 -07:00
Zach Jang ab095b445a 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
2015-09-21 18:58:10 +00:00
Evgenii Stepanov 186a89f2c1 am 1cb3285e: am f267f714: am 908260a5: Merge "Add support of SANITIZE_TARGET=\'address coverage\' for fuzzing."
* commit '1cb3285e8d0e404d72f4b732d1346c0c23a797a7':
  Add support of SANITIZE_TARGET='address coverage' for fuzzing.
2015-09-19 20:07:33 +00:00
Evgenii Stepanov 1cb3285e8d am f267f714: am 908260a5: Merge "Add support of SANITIZE_TARGET=\'address coverage\' for fuzzing."
* commit 'f267f7147fe74b6d523b8f3b700bef276f2782bb':
  Add support of SANITIZE_TARGET='address coverage' for fuzzing.
2015-09-18 20:41:48 +00:00
Evgenii Stepanov f267f7147f am 908260a5: Merge "Add support of SANITIZE_TARGET=\'address coverage\' for fuzzing."
* commit '908260a56631cad51196c7b197f720bc88d7f5c7':
  Add support of SANITIZE_TARGET='address coverage' for fuzzing.
2015-09-18 20:31:54 +00:00
Ivan Krasin 74b32b8dfc Add support of SANITIZE_TARGET='address coverage' for fuzzing.
Also, add trace-cmp instrumentation to fuzz_test and host_fuzz_test.

Bug: 22850550
Change-Id: Ifff7b8be693ae991feb0a64e19439370a19b2748
2015-09-18 11:54:43 -07:00
Zach Jang 48e2b43e8c 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
2015-09-17 20:04:17 +00:00
Zach Jang 47ef4c3467 DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings
CL#2/3

b/23946860

Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3
2015-09-17 01:22:39 +00:00
Ying Wang ec4d46f74e am 8b037b67: am 942672d8: am 45075cf6: Merge "Generate installed-files-vendor.txt"
* commit '8b037b6765ac6390e0fe6217aba9eac592f2a108':
  Generate installed-files-vendor.txt
2015-09-16 02:39:29 +00:00
Ying Wang 8b037b6765 am 942672d8: am 45075cf6: Merge "Generate installed-files-vendor.txt"
* commit '942672d82b7be88c252ff4c979039eb40349cef0':
  Generate installed-files-vendor.txt
2015-09-15 23:21:11 +00:00
Ying Wang 942672d82b am 45075cf6: Merge "Generate installed-files-vendor.txt"
* commit '45075cf623fc59930594ac27c675cd43e36975b1':
  Generate installed-files-vendor.txt
2015-09-15 23:10:16 +00:00
Ying Wang 8da19e3688 Generate installed-files-vendor.txt
Similar to installed-files.txt, installed-files-vendor.txt lists the
content of vendor.img.

Bug: 24009297
Change-Id: Ib8112b19cc9f54d0c0d6a829063e4fe72d8ce664
2015-09-15 14:24:00 -07:00
Tao Bao 7540c08807 Revert "Temporarily use blockimgdiff v2 for OTA."
This reverts commit d07bfc5196.

Real fixes [1][2][3] are ready to merge. Time to revert the workaround.

[1] commit d47d8e1488
[2] commit 1fc67631ee
[3] commit 937847ae49

Bug: 22430577
Change-Id: Icd6623e8717c93ad1f12cd1ba43db5e006e928ad
2015-08-26 15:29:00 -07:00
Claes Elgemark 8d77197121 Don't fail build of otatools if there are no device certificates
Bug: 23552169
Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
2015-08-26 10:07:16 -07:00
Doug Zongker 32bf3f3265 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 f22b0f43ef)
2015-08-24 15:43:40 -07:00
Tao Bao 23bf2ba887 am 04ae3520: am d88eaf02: am 123a7d38: Merge "build: Don\'t call make_recovery_patch if there\'s no recovery."
* commit '04ae3520a2e6cf44933a565fed6e478e60cdda9b':
  build: Don't call make_recovery_patch if there's no recovery.
2015-08-19 03:10:29 +00:00
Tao Bao 04ae3520a2 am d88eaf02: am 123a7d38: Merge "build: Don\'t call make_recovery_patch if there\'s no recovery."
* commit 'd88eaf025543c3e5360fb22f1d142133621b117e':
  build: Don't call make_recovery_patch if there's no recovery.
2015-08-19 02:47:48 +00:00
Tao Bao 42a2b83c53 am d88eaf02: am 123a7d38: Merge "build: Don\'t call make_recovery_patch if there\'s no recovery."
* commit 'd88eaf025543c3e5360fb22f1d142133621b117e':
  build: Don't call make_recovery_patch if there's no recovery.
2015-08-19 02:46:41 +00:00
Tao Bao cbc6dc29d6 build: Don't call make_recovery_patch if there's no recovery.
Change-Id: Iea1bd529eca9cd607da3b420bc4287f95c18219d
2015-08-18 18:28:47 -07:00
Dan Willemsen dd122b1ea2 am 014719fc: resolved conflicts for merge of 05fae7e0 to mnc-dr-dev-plus-aosp
* commit '014719fcfc240910fa216c39826b95d712468183':
  Use repeatable timestamps
2015-08-18 04:15:47 +00:00
Dan Willemsen 9cf990beec resolved conflicts for merge of 05fae7e0 to mnc-dev-plus-aosp
Change-Id: I9f0f1169839afabc7ec7e439b668798e2cd111a3
2015-08-17 20:50:48 -07:00
Dan Willemsen 014719fcfc resolved conflicts for merge of 05fae7e0 to mnc-dr-dev-plus-aosp
Change-Id: I32919ab1e3cd5f84d09180125a7294bcfa35549e
2015-08-17 20:44:29 -07:00
Dan Willemsen e65107508a Merge "Use repeatable timestamps" 2015-08-18 03:30:11 +00:00
Qiwen Zhao 5971fe3476 Merge commit '68e0bbf9'
Change-Id: I04f361807f8568bc87c4d035d52594eff16955fa
2015-08-12 18:54:45 -07:00
Dianne Hackborn 68e0bbf998 am 59a76529: am 6ff3e53f: am 897f3ba8: am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev
* commit '59a7652985c6e49478348c6643b491275f1dc8f3':
  Fix issie #23116383: Include security patch level in Settings
2015-08-13 01:18:07 +00:00
Dianne Hackborn 897f3ba8b1 am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev
* commit '25abc5a38e2e7f2962463aa4e5cd407ecdde689c':
  Fix issie #23116383: Include security patch level in Settings
2015-08-13 00:54:30 +00:00
Dianne Hackborn 42ebdfc574 am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev
* commit '25abc5a38e2e7f2962463aa4e5cd407ecdde689c':
  Fix issie #23116383: Include security patch level in Settings
2015-08-13 00:53:51 +00:00
Nick Kralevich 0933e17bb6 am cd8f838d: am c85364c9: am 5f79bcdd: Merge changes from topic \'file_contexts.bin\'
* commit 'cd8f838d079b38d8c125396f7932c4be24063193':
  build: switch over to file_contexts.bin only
  Update embedded.mk to support file_contexts.bin
2015-08-13 00:10:36 +00:00
Nick Kralevich cd8f838d07 am c85364c9: am 5f79bcdd: Merge changes from topic \'file_contexts.bin\'
* commit 'c85364c9c91961461a6d81a37c8b30b34b02383b':
  build: switch over to file_contexts.bin only
  Update embedded.mk to support file_contexts.bin
2015-08-13 00:01:09 +00:00
Nick Kralevich 420662b9cd am c85364c9: am 5f79bcdd: Merge changes from topic \'file_contexts.bin\'
* commit 'c85364c9c91961461a6d81a37c8b30b34b02383b':
  build: switch over to file_contexts.bin only
  Update embedded.mk to support file_contexts.bin
2015-08-13 00:00:36 +00:00
Nick Kralevich 5f79bcdd07 Merge changes from topic 'file_contexts.bin'
* changes:
  build: switch over to file_contexts.bin only
  Update embedded.mk to support file_contexts.bin
2015-08-12 23:46:28 +00:00
Dianne Hackborn e593e5c42a Fix issie #23116383: Include security patch level in Settings
Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
2015-08-12 16:29:08 -07:00
Dan Willemsen ccc933e97b Use repeatable timestamps
This moves all of the date references under build/ to using a single
datetime that can be set manually using BUILD_DATETIME.

It also adds an option, OVERRIDE_C_DATE_TIME, that if set to true, will
redefine __DATE__ and __TIME__ for all C/C++ files so that it matches
BUILD_DATETIME.

Bug: 23117013
Change-Id: I7c17a32b794a5adf40b9cd69136fb0ff9f6084ec
2015-08-12 00:02:20 -07:00
Dan Willemsen 8e29bba8c3 am ec5e3aae: resolved conflicts for merge of b184ec2a to mnc-dr-dev-plus-aosp
* commit 'ec5e3aae6d8c89a5f6ca0a34fcdfc72e9a611188':
  Revert "Use repeatable timestamps"
2015-08-12 01:38:06 +00:00
Dan Willemsen 8478f7abbd resolved conflicts for merge of b184ec2a to mnc-dev-plus-aosp
Change-Id: I6178127dd19ee553c15343fc0120af9463b7ac4d
2015-08-11 18:31:59 -07:00
Dan Willemsen a635da13b2 am a3b91e62: resolved conflicts for merge of c576c08f to mnc-dr-dev-plus-aosp
* commit 'a3b91e621c4ca1708fa2572e05e8ac5b0f4b5d17':
  Use repeatable timestamps
2015-08-12 01:28:03 +00:00
Dan Willemsen ec5e3aae6d resolved conflicts for merge of b184ec2a to mnc-dr-dev-plus-aosp
Change-Id: I90ac0f467ff13a038f27581cb2d07b1c5af5bd92
2015-08-11 18:27:02 -07:00
Dan Willemsen 33f46daa22 resolved conflicts for merge of c576c08f to mnc-dev-plus-aosp
Change-Id: I2d28518ac5a26de7c5df9a2e3a1902e880155101
2015-08-11 18:21:43 -07:00
Dan Willemsen a3b91e621c resolved conflicts for merge of c576c08f to mnc-dr-dev-plus-aosp
Change-Id: I86f6d0e7b9def5afa618915e7249c6758a5f0d1b
2015-08-11 18:11:48 -07:00
Dan Willemsen 608aa91db7 Merge "Revert "Use repeatable timestamps"" 2015-08-12 01:02:19 +00:00
Dan Willemsen 92026f2d36 Revert "Use repeatable timestamps"
OSX `date` doesn't understand -d

This reverts commit 13ba6e00f4.

Change-Id: I5970032ff02cc07bd3b087e1eeb5f19b1e4194b4
2015-08-12 01:00:19 +00:00
Dan Willemsen 671b8ff545 Merge "Use repeatable timestamps" 2015-08-12 00:49:26 +00:00
Dan Willemsen 13ba6e00f4 Use repeatable timestamps
This moves all of the date references under build/ to using a single
datetime that can be set manually using BUILD_DATETIME.

It also adds an option, OVERRIDE_C_DATE_TIME, that if set to true, will
redefine __DATE__ and __TIME__ for all C/C++ files so that it matches
BUILD_DATETIME.

Bug: 23117013
Change-Id: I880ef103a26bca86bd7bf42d58e62e740a6228c8
2015-08-11 17:08:03 -07:00
Ying Wang 1204e257fc am d67b8c1a: am 23cb26c7: am 20febe3d: Merge "Don\'t build otapackage on Mac."
* commit 'd67b8c1ab68ec57ff2b82d41453c406381fa5a08':
  Don't build otapackage on Mac.
2015-08-11 23:28:44 +00:00
Ying Wang d67b8c1ab6 am 23cb26c7: am 20febe3d: Merge "Don\'t build otapackage on Mac."
* commit '23cb26c7bfa1714db3b31b166be49a0aa46e4a08':
  Don't build otapackage on Mac.
2015-08-11 23:23:45 +00:00
Ying Wang 2bf0ba2dcf am 23cb26c7: am 20febe3d: Merge "Don\'t build otapackage on Mac."
* commit '23cb26c7bfa1714db3b31b166be49a0aa46e4a08':
  Don't build otapackage on Mac.
2015-08-11 23:23:39 +00:00
Ying Wang 20febe3d83 Merge "Don't build otapackage on Mac." 2015-08-11 22:49:25 +00:00
Ying Wang 09c4b68dfd Don't build otapackage on Mac.
Also removed the unneeded variable DISTTOOLS
and the unnecessary dependency of otapackage/updatepackage on DISTTOOLS.

Bug: 23085297
Change-Id: I6b269003a72bb48eda1260c8d9b4bd88974bcde9
2015-08-11 11:45:54 -07:00
Ying Wang 25a1c48de7 am fd50d4de: am a1655645: am edf7bf8d: Merge "Allow custom recovery resource dirs."
* commit 'fd50d4dec3e57ebf1877021a242659b668788a95':
  Allow custom recovery resource dirs.
2015-08-10 22:31:02 +00:00
Ying Wang 49e20876b6 am a1655645: am edf7bf8d: Merge "Allow custom recovery resource dirs."
* commit 'a16556450c53c18d49fa55ad2a5f08880f997e04':
  Allow custom recovery resource dirs.
2015-08-10 22:28:30 +00:00
Ying Wang fd50d4dec3 am a1655645: am edf7bf8d: Merge "Allow custom recovery resource dirs."
* commit 'a16556450c53c18d49fa55ad2a5f08880f997e04':
  Allow custom recovery resource dirs.
2015-08-10 22:27:01 +00:00
Ying Wang 9a17568624 Allow custom recovery resource dirs.
Set TARGET_PRIVATE_RES_DIRS in your BoardConfig.mk to specify custom
private recovery resource directories.
With this change you can share the same recovery resource dir for more
than one device; Also you can specify more than one directories.

Change-Id: Ieeb18f5ac11c98b6f08d0ab6fb4e0d9aa72b27e7
2015-08-10 11:33:10 -07:00
Furquan Shaikh 16853a6c35 am 5620d94c: am 449b8a06: am c4904316: am ffe86de5: Merge "vboot_signer: Add kernel subkey required for signing kernel keyblock" into mnc-dr-dev
* commit '5620d94c5fd5a249f1805ca7acd5fe22930ddef4':
  vboot_signer: Add kernel subkey required for signing kernel keyblock
2015-08-10 12:59:13 +00:00
Furquan Shaikh 5620d94c5f am 449b8a06: am c4904316: am ffe86de5: Merge "vboot_signer: Add kernel subkey required for signing kernel keyblock" into mnc-dr-dev
* commit '449b8a0664db86e9a556c323e3f4720303abae95':
  vboot_signer: Add kernel subkey required for signing kernel keyblock
2015-08-10 12:53:56 +00:00
Furquan Shaikh e8c212235f vboot_signer: Add kernel subkey required for signing kernel keyblock
Currently, the keyblock was being generated using
data_key.vbprivk. However, we need to use kernel_subkey.vbprivk for
kernel keyblock generation. This did not create any issues until now
because dev-mode just throws a message saying that keyblock is
invalid. But, normal-mode does not boot if keyblock is
invalid. Add extra parameter for passing in kernel subkey to
vboot_signer script.

TEST="make bootimage-nodeps" generates correctly signed
boot.img. Verified that the image boots fine in normal mode.

Change-Id: I0fc2183b466e34ddf1d98c9532072548504fcec4
Signed-off-by: Furquan Shaikh <furquan@google.com>
2015-08-07 12:01:20 -07:00
Tao Bao 9d49568900 am 7c6a2a4c: resolved conflicts for merge of 610520ad to mnc-dr-dev-plus-aosp
* commit '7c6a2a4ccf30ce74a5acddec406fdf4243da1e50':
  build: Support packaging for system_root_image.
2015-08-06 18:07:42 +00:00
Tao Bao 7c6a2a4ccf resolved conflicts for merge of 610520ad to mnc-dr-dev-plus-aosp
Change-Id: If44e033d2163b1e357be78b5a9e1b6092baf5063
2015-08-06 11:01:31 -07:00
Tao Bao 91fdd1a321 resolved conflicts for merge of 610520ad to mnc-dev-plus-aosp
Change-Id: I55ad47c70091d4f42f83783e9876846f19e2a777
2015-08-06 10:57:57 -07:00
Tao Bao 62bd479fdf build: Support packaging for system_root_image.
If system image contains the root directory
(BOARD_BUILD_SYSTEM_ROOT_IMAGE == "true"), we package the root directory
into ROOT/ instead of BOOT/RAMDISK/ in the target_files zip.

Change-Id: I817776ca97194991308b2131d0e34ab136283464
2015-08-05 16:39:39 -07:00
Stephen Smalley d3a803e668 build: switch over to file_contexts.bin only
Change all uses of the file_contexts file to use the
file_contexts.bin file instead.

Depends on
   I75a781100082c23536f70ce3603f7de42408b5ba
   I43806d564b83d57f05f5c36c8eba7b1ff4831b04
   Id560d093440a2aba99cef28c20133b35feebf950
   I15660f4b3e4c5cb8ae0ec1498c74d6fcbb9a0400

Change-Id: Iaf8c4b2e420f610425a07f48db7af32bda3f5b3a
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-08-04 14:59:06 -04:00
Daniel Rosenberg 6344247985 am 0f49fed7: am c26fddcc: am e4fed421: Merge "build: core: Fix issue in recovery"
* commit '0f49fed7cfcb08221e91f1a6a9934bfbbde970cf':
  build: core: Fix issue in recovery
2015-08-03 18:08:53 +00:00
Daniel Rosenberg 85e6106db7 am 68fd2113: am 545f226d: am 46afd7f9: Merge "Add ro.build.system_root_image"
* commit '68fd21137b09523ebaa3748e57d7eedd0d0ec2ef':
  Add ro.build.system_root_image
2015-08-03 18:08:50 +00:00
Daniel Rosenberg 0f49fed7cf am c26fddcc: am e4fed421: Merge "build: core: Fix issue in recovery"
* commit 'c26fddcc5be8876854fe3b44c0c48a0c47de8c07':
  build: core: Fix issue in recovery
2015-08-03 17:57:24 +00:00
Daniel Rosenberg 68fd21137b am 545f226d: am 46afd7f9: Merge "Add ro.build.system_root_image"
* commit '545f226db0978639aba41f16f623a395dad4209c':
  Add ro.build.system_root_image
2015-08-03 17:56:45 +00:00
Daniel Rosenberg 1e6ee759b3 am c26fddcc: am e4fed421: Merge "build: core: Fix issue in recovery"
* commit 'c26fddcc5be8876854fe3b44c0c48a0c47de8c07':
  build: core: Fix issue in recovery
2015-08-01 00:24:00 +00:00
Daniel Rosenberg b7c57cba9f am 545f226d: am 46afd7f9: Merge "Add ro.build.system_root_image"
* commit '545f226db0978639aba41f16f623a395dad4209c':
  Add ro.build.system_root_image
2015-08-01 00:18:40 +00:00
Daniel Rosenberg e4fed421d5 Merge "build: core: Fix issue in recovery" 2015-08-01 00:10:09 +00:00
Daniel Rosenberg 46afd7f981 Merge "Add ro.build.system_root_image" 2015-08-01 00:05:05 +00:00
Daniel Rosenberg 7b82656984 build: core: Fix issue in recovery
Now that symlinks are created at build time, the rsync while
making recovery runs into issues around the etc symlink

Change-Id: Ie781507b22e4661629840075b274eaab2f712de6
2015-07-31 16:52:21 -07:00
Daniel Rosenberg 59156a6b7d Add ro.build.system_root_image
ro.build.system_root_image is true if the root directory is built
into the system image.

Change-Id: I17208ebd004c63aebb09db6c3e5f795619e73bd2
2015-07-31 16:52:21 -07:00
Tao Bao fa752c84e2 am b2416d8e: resolved conflicts for merge of bbb41a70 to mnc-dr-dev-plus-aosp
* commit 'b2416d8e5c6ce31edb40df6fb3998716940575b9':
  build: Fix "adb shell" in recovery for system_root_image.
2015-07-31 17:09:11 +00:00
Tao Bao b2416d8e5c resolved conflicts for merge of bbb41a70 to mnc-dr-dev-plus-aosp
Change-Id: Icc2ed1632cf023785ddfbae09478ea0ffb025167
2015-07-31 10:01:09 -07:00
Tao Bao c5bd8c29d6 resolved conflicts for merge of bbb41a70 to mnc-dev-plus-aosp
Change-Id: I250c007de89a52f8911cf56d7dfded38962284ac
2015-07-31 09:58:03 -07:00
Tao Bao be46a54589 build: Fix "adb shell" in recovery for system_root_image.
For system images that contain the root directory, "adb shell" in
recovery stops working if the image is mounted at "/system", because
sh now locates at /system/system/bin/sh. We fix the issue by mounting
the image on /system_root and create a symlink to /system_root/system
for /system.

Bug: 22855115
Change-Id: Ia6b257b75aeb67687c3909063d1725a23a5ccd60
2015-07-30 16:44:17 -07:00
Simon Wilson 37700c9ad1 Merge "Add compressor options for squashfs system images" 2015-07-29 21:35:57 +00:00
Tao Bao 0d511afcb8 resolved conflicts for merge of 910d3822 to mnc-dev-plus-aosp
Change-Id: Ied44516c7c2e46b93965dbdb8fb4bc98d6ed3310
2015-07-28 17:03:09 -07:00
Tao Bao 7eddd6285f resolved conflicts for merge of 910d3822 to mnc-dr-dev-plus-aosp
Change-Id: I2c899be9d6a82664e4d14c903311daeed5e546fd
2015-07-28 16:58:03 -07:00
Tao Bao f2cffbddb9 Support systems that use a full copy of recovery image.
If BOARD_USES_FULL_RECOVERY_IMAGE == true, a full copy of recovery
image will be carried as /system/etc/recovery.img instead of a patch
at /system/recovery_from_boot.p.

Bug: 22641135
Change-Id: Ie271d3e2d55d7b003f667ac5b44203d69b23c63b
(cherry picked from commit 8beab69bd5)
2015-07-28 12:20:36 -07:00
Tao Bao 8beab69bd5 Support systems that use a full copy of recovery image.
If BOARD_USES_FULL_RECOVERY_IMAGE == true, a full copy of recovery
image will be carried as /system/etc/recovery.img instead of a patch
at /system/recovery_from_boot.p.

Bug: 22641135
Change-Id: I4acaca86c22bca55c2b936a820edf1f333615609
2015-07-23 13:13:19 -07:00
Ying Wang f5e94cc17f am c677675c: am 83568a6d: Merge "Create OUT_DIR before writing build_number.txt."
* commit 'c677675cccc8a6894b45469a9b8b4f72efe99b9d':
  Create OUT_DIR before writing build_number.txt.
2015-07-23 02:06:37 +00:00
Colin Cross 8d9dfa3d9b resolved conflicts for merge of 8c25fd56 to mnc-dev-plus-aosp
Change-Id: I318ce3d7bbfbcaf849a36543662f4c63b7377927
2015-07-22 19:01:07 -07:00
Ying Wang 4ed70e43a0 am c677675c: am 83568a6d: Merge "Create OUT_DIR before writing build_number.txt."
* commit 'c677675cccc8a6894b45469a9b8b4f72efe99b9d':
  Create OUT_DIR before writing build_number.txt.
2015-07-22 00:12:16 +00:00
Ying Wang 06332732a4 Create OUT_DIR before writing build_number.txt.
Change-Id: I6a84ec59194c48f4291480cb0c94db0da488518c
2015-07-21 16:39:46 -07:00
Colin Cross 7302168213 resolved conflicts for merge of 8c25fd56 to mnc-dr-dev-plus-aosp
Change-Id: Id97d2e9d2749bf5739ede583462ef83adb1ee60c
2015-07-21 12:54:17 -07:00
Colin Cross f37b455858 Read BUILD_NUMBER from file in rules
Using $(BUILD_NUMBER) inside a rule causes odd behavior, as the rule
is different every time make is run, but since make doesn't depend
on the command line it only ends up being built with the new value
if some other dependency has changed.

To allow ninja, which does depend on the command line, to provide the
same behavior, store the build number in out/build_number.txt, and
use a shell expansion to cat the file in rules that use it.  This will
cause the rule command to stay identical between builds, while still
getting the new build number if the rule is rerun for a dependency.

Also use the same trick for BUILD_FINGERPRINT, and the date in
droiddoc rules.

Change-Id: I6c5e6b6b3ef4c613563d7f5604df0e401575ba5f
2015-07-18 12:15:04 -07:00
Tao Bao 95154ca1fe am 5a2ed731: am f737a120: Merge "Enable verbose output for add_img_to_target_files."
* commit '5a2ed7314f0d6a5dd899694ecfc880cc6a414ff7':
  Enable verbose output for add_img_to_target_files.
2015-07-16 00:13:37 +00:00
Tao Bao 6b0211616a am 5a2ed731: am f737a120: Merge "Enable verbose output for add_img_to_target_files."
* commit '5a2ed7314f0d6a5dd899694ecfc880cc6a414ff7':
  Enable verbose output for add_img_to_target_files.
2015-07-16 00:13:17 +00:00
Tao Bao 7055791db5 Enable verbose output for add_img_to_target_files.
Change-Id: I7246c59c79ccf6a7589c884391d0f690746fc129
2015-07-15 11:53:39 -07:00
Tao Bao 358da0c015 Revert "Temporarily use blockimgdiff v2 for OTA."
The workround should stay in mnc-dr-dev branch only.

This reverts commit d07bfc5196.

Change-Id: If8d2d88d50e87f031ed6df44b01a1e9e38a7f97f
2015-07-13 17:00:04 -07:00
Tao Bao 2313005918 am 0e66c70d: am d07bfc51: Temporarily use blockimgdiff v2 for OTA.
* commit '0e66c70d0185f24df3e4af984f269f1263766af4':
  Temporarily use blockimgdiff v2 for OTA.
2015-07-13 15:57:02 +00:00
Tao Bao d07bfc5196 Temporarily use blockimgdiff v2 for OTA.
angler and bullhead have smaller cache partiton (~100MB) and hit issue
with incremental OTA (such as MDA09B to MDA12) that requires more stash
space with BBOTA v3. Temporarily use v2 as a workaround, until we come
up with a real fix. Note that BBOTA v2 still uses some stash space, but
should be much smaller than v3.

Bug: 22430577
Change-Id: Ic4c05f3609732e7d5140703062da9fe11df5c6d3
2015-07-12 23:45:24 -07:00
Tao Bao 6a7d8fced3 am 03125de6: am c8812493: Merge "Pack file_contexts into target_files zip."
* commit '03125de6b57fc358e14cbcd1798cdf9d3289b72f':
  Pack file_contexts into target_files zip.
2015-07-10 21:56:22 +00:00
Tao Bao e7a4b429d2 am 03125de6: am c8812493: Merge "Pack file_contexts into target_files zip."
* commit '03125de6b57fc358e14cbcd1798cdf9d3289b72f':
  Pack file_contexts into target_files zip.
2015-07-10 21:56:02 +00:00
Tao Bao 2c15d9eefe Pack file_contexts into target_files zip.
file_contexts (specified by SELINUX_FC) is needed both when building
and (re)packaging. We used to use the copy in out/ when building, and
looked for the copy in BOOT/RAMDISK/ when packaging from target_files
zip. With system_root_image enabled, the file_contexts needed for
building and packaging might be different from the one on device. So
we explicitly pack the file as META/file_contexts in target_files zip.

Also refactor out the overriding of selinux_fc property into
common.LoadInfoDict().

Change-Id: I94f9ea6671b3792c12c1c21573840743d63da39a
(cherry picked from commit aa7318c384)
2015-07-10 14:21:16 -07:00
Thierry Strudel 4ec1abca84 am a69dcefd: am 74a81e66: fix device specific fs_config on build server
* commit 'a69dcefda3ec493216f401117417d86f8ef757ac':
  fix device specific fs_config on build server
2015-07-10 19:26:24 +00:00
Thierry Strudel f4e503774e am 74a81e66: fix device specific fs_config on build server
* commit '74a81e6633276d92337749a5ee9d921207814dd4':
  fix device specific fs_config on build server
2015-07-10 18:44:53 +00:00
Thierry Strudel 74a81e6633 fix device specific fs_config on build server
fs_config function from libcutils, in order to properly set the xattr FS
used to define device specific uid, gid, permissions and capabilities,
now needs TARGET_OUT make variable to be passed explicitly to all tools
using it:
  fs_config
  fs_get_stats used by mktarball.sh
  make_ext4fs used by mkuserimg.sh
  mksquashfs used by mksquashfsimage.sh

Bug: 21989305
Bug: 22048934
Change-Id: I6caf9cf870882fce2ead93027767092c29b75ded
Signed-off-by: Thierry Strudel <tstrudel@google.com>
2015-07-10 10:55:54 -07:00
Simon Wilson 011ea06db7 Add compressor options for squashfs system images
Change-Id: I2a75f8754273f6e00b96ba6aca6741c4388f5da8
(cherry picked from commit f86e7eeabc)
2015-07-07 11:41:20 -07:00
Tao Bao 4e66343b2b Retry adjusting the size computation for reserved blocks.
Due to the change in https://lwn.net/Articles/546473/, kernel reserves a
few extra blocks (lesser of 2% and 4096 blocks) on ext4 FS which leads to
OTA update failures. Adjust the size computation if the device has
BOARD_HAS_EXT4_RESERVED_BLOCKS := true.

It amends the last attemp in [1]. Now it computes the used blocks from the
make_ext4fs output, instead of altering its argument.

[1]: commit efbb5d2e69.

Bug: 21522719
Bug: 22023465
Bug: 22174684
Change-Id: Iaae6507f6de68a5892f2e3035d330039287b4492
(cherry picked from commit c7a6f1e4f8)
2015-06-30 12:17:28 -07:00
Tao Bao ed95997724 resolved conflicts for merge of c7a6f1e4 to mnc-dev-plus-aosp
Change-Id: I3201c1d7f9e8b451614259c2fec70c07ae9c8332
2015-06-30 09:33:12 -07:00
Tao Bao c7a6f1e4f8 Retry adjusting the size computation for reserved blocks.
Due to the change in https://lwn.net/Articles/546473/, kernel reserves a
few extra blocks (lesser of 2% and 4096 blocks) on ext4 FS which leads to
OTA update failures. Adjust the size computation if the device has
BOARD_HAS_EXT4_RESERVED_BLOCKS := true.

It amends the last attemp in [1]. Now it computes the used blocks from the
make_ext4fs output, instead of altering its argument.

[1]: commit efbb5d2e69.

Bug: 21522719
Bug: 22023465
Bug: 22174684
Change-Id: I9783a51abe6581ff5c75db81e78ac606d0f32c4c
2015-06-29 20:45:53 -07:00
Tao Bao bdf7d94aac am 2384d01c: Revert "Adjust the size computation for reserved blocks"
* commit '2384d01c1c4c5b259840ec526ec8f5ec18cd8087':
  Revert "Adjust the size computation for reserved blocks"
2015-06-29 20:56:34 +00:00
Tao Bao 2384d01c1c Revert "Adjust the size computation for reserved blocks"
We should not change the parameter to mkfs_ext4. Bug filed at
b/22174684. Will come up with a new CL.

This reverts commit efbb5d2e69.

Change-Id: I15f7a9a07a65a936ba186d2ce672ec4832ed3e17
2015-06-29 12:55:38 -07:00
Ying Wang 78d1cba0f4 Fix conflict resolving error in ef5dc90bba
Change-Id: Ib561c8dec3bbd605007b46b8520f12d6e3e2db90
2015-06-26 14:06:32 -07:00
Mohamad Ayyash aae1a0ba48 resolved conflicts for merge of 1a4658cd to mnc-dev 2015-06-25 17:24:05 -07:00
Ying Wang f6bb95b7a9 am 48f68478: am 8f180b90: Merge "Create userdata.img with real data when SANITIZE_TARGET=address."
* commit '48f68478bd2a375886f30c01b63920575739d9db':
  Create userdata.img with real data when SANITIZE_TARGET=address.
2015-06-25 21:54:52 +00:00
Ying Wang 8f180b904f Merge "Create userdata.img with real data when SANITIZE_TARGET=address." 2015-06-25 21:29:52 +00:00
Ying Wang 2a04839aec Create userdata.img with real data when SANITIZE_TARGET=address.
Bug: 21785137
Change-Id: Ie0c36988759fe07419ad29bab5a71cdd0d992d2a
2015-06-25 14:29:04 -07:00
Mohamad Ayyash 6f79df6ced resolved conflicts for merge of af094912 to mnc-dev-plus-aosp 2015-06-25 12:13:56 -07:00
Mohamad Ayyash 19cfe7db4c Merge "Add img2simg in host and ota packages" 2015-06-25 18:44:03 +00:00
Mohamad Ayyash 1a4658cd3b resolved conflicts for merge of ef5dc90b to lmp-mr1-ub-dev 2015-06-24 16:54:12 -07:00
Simon Wilson 5e14d57658 am b7b7aede: Merge "resolved conflicts for merge of ecfc97f7 to mnc-dev" into mnc-dev
* commit 'b7b7aedeb3c960890e3842ec8e729dbd10077ae4':
  Add compressor options for squashfs system images
2015-06-24 23:42:29 +00:00
Mohamad Ayyash 5ee381704f am 914811a9: Merge "Add img2simg in host and ota packages" into mnc-dev
* commit '914811a9f283ed3d8aa826abddf8c11f6167dc14':
  Add img2simg in host and ota packages
2015-06-24 23:42:27 +00:00
Simon Wilson b7b7aedeb3 Merge "resolved conflicts for merge of ecfc97f7 to mnc-dev" into mnc-dev 2015-06-24 23:14:07 +00:00
Mohamad Ayyash 914811a9f2 Merge "Add img2simg in host and ota packages" into mnc-dev 2015-06-24 23:13:51 +00:00
Mohamad Ayyash ef5dc90bba Add img2simg in host and ota packages
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 16:13:07 -07:00
Mohamad Ayyash 9764892031 Add img2simg in host and ota packages
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 16:08:15 -07:00
Simon Wilson 6d5ddc32ab resolved conflicts for merge of ecfc97f7 to mnc-dev
Change-Id: Ic7661c4176dc87cb2796f9cbb61bdd64f89cdc01
2015-06-24 16:06:34 -07:00
Mohamad Ayyash 353265b081 Add img2simg in host and ota packages
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 23:01:27 +00:00
Simon Wilson ecfc97f772 resolved conflicts for merge of f86e7eea to lmp-mr1-ub-dev
Change-Id: I746021aa57edd5f6fae6e57cec0908951a659664
2015-06-24 15:42:27 -07:00
Mohamad Ayyash 865369e63b am 9ff8a716: am f35ed6bd: resolved conflicts for merge of cade49dd to lmp-mr1-ub-dev
* commit '9ff8a7162b1c6f8d10768537a8e3f45601d8d6da':
  Allow flashing a squashfs system image
2015-06-24 02:13:41 +00:00
Tao Bao 344af6d18c am 7102f577: Merge "Adjust the size computation for reserved blocks" into mnc-dev
* commit '7102f57781a8cde2e450951af3cbd7e60b44dca1':
  Adjust the size computation for reserved blocks
2015-06-24 02:13:40 +00:00
Mohamad Ayyash 9ff8a7162b am f35ed6bd: resolved conflicts for merge of cade49dd to lmp-mr1-ub-dev
* commit 'f35ed6bd8497633c057030e5442cd0fc29b37b6c':
  Allow flashing a squashfs system image
2015-06-24 01:38:26 +00:00
Mohamad Ayyash f35ed6bd84 resolved conflicts for merge of cade49dd to lmp-mr1-ub-dev 2015-06-23 16:22:32 -07:00
Tao Bao efbb5d2e69 Adjust the size computation for reserved blocks
Due to the change in https://lwn.net/Articles/546473/, kernel reserves a
few extra blocks (lesser of 2% and 4096 blocks) on ext4 FS which leads to
OTA update failures. Adjust the size computation if the device has
BOARD_HAS_EXT4_RESERVED_BLOCKS := true.

Bug: 21522719
Bug: 22023465
Change-Id: I49f16adbf2dedc5279fbb8622bf99ef71dcc494f
2015-06-23 14:53:28 -07:00
Ying Wang b3ba45c5df am cb544c25: am 83aca79b: Merge "Don\'t include static executables when SANITIZE_TARGET=address"
* commit 'cb544c2507cc6caafec61eff67405096868a7bc8':
  Don't include static executables when SANITIZE_TARGET=address
2015-06-23 20:53:40 +00:00
Ying Wang e6e544e596 Don't include static executables when SANITIZE_TARGET=address
Also we can't build the ota package without these static executables.

Bug: 21785137
Change-Id: I11b35abebced4b0608378a072ece2ab2dbadeffb
2015-06-23 10:46:03 -07:00
Simon Wilson f86e7eeabc Add compressor options for squashfs system images
Change-Id: I2a75f8754273f6e00b96ba6aca6741c4388f5da8
2015-06-22 15:42:52 -07:00
Mohamad Ayyash cade49ddee Allow flashing a squashfs system image
Change-Id: Ic51d11274784a8d2e9d57d5f0b821ebc89680e5a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-16 13:11:21 -07:00
Ying Wang 616f5707a3 am 740dee5a: am 1b96592a: Merge "Add build_verity_metadata.py to dist-tools"
* commit '740dee5a5626724051883b6f9c9a7df511b65b29':
  Add build_verity_metadata.py to dist-tools
2015-06-09 16:41:29 +00:00
Ying Wang 1b96592aab Merge "Add build_verity_metadata.py to dist-tools" 2015-06-09 16:20:49 +00:00
Claes Elgemark b5cd1f03c2 Add missing shared libraries to dist tools
(cherry pick from d0ec665727)

Add missing libraries used by e2fsck and build_verity_tree.

Change-Id: I8bf0341300863ef0090b395b2aba0b7a952f6b58
2015-06-09 09:16:27 -07:00
Mark Salyzyn 6d69751916 am 5ced4018: am 911637bf: Merge "Add missing shared libraries to dist tools"
* commit '5ced401874da219d66077f7a85c939594624ae0c':
  Add missing shared libraries to dist tools
2015-06-09 00:15:53 +00:00
Ying Wang bae01ccd97 am 18e98163: am 8e42131b: Merge "Strip path from verity_signer_cmd in the target-files meta data."
* commit '18e981638d77af502a42895fbb37bc80e3642283':
  Strip path from verity_signer_cmd in the target-files meta data.
2015-06-09 00:01:03 +00:00
Mark Salyzyn 911637bf33 Merge "Add missing shared libraries to dist tools" 2015-06-08 23:51:33 +00:00
Ying Wang 8e42131ba2 Merge "Strip path from verity_signer_cmd in the target-files meta data." 2015-06-08 23:40:01 +00:00
Claes Elgemark 82a19d3662 Add build_verity_metadata.py to dist-tools
Preserve path as it is referenced by build_image.py.

Change-Id: Id6833d243b5a15b4ee5e0013340aeb2cd35f3578
2015-06-05 10:31:53 +02:00
Claes Elgemark d0ec665727 Add missing shared libraries to dist tools
Add missing libraries used by e2fsck and build_verity_tree.

Change-Id: I8bf0341300863ef0090b395b2aba0b7a952f6b58
2015-06-04 14:31:56 +02:00
Ying Wang 9e8899c75e am 3bb1bea9: am 9fed6369: Merge "Add VeritySigner.jar to ota tools"
* commit '3bb1bea968f4cc3754cacad1ec41ac01cc6cf259':
  Add VeritySigner.jar to ota tools
2015-06-03 18:36:20 +00:00
Claes Elgemark d53cd9b0b1 Add VeritySigner.jar to ota tools
Used by verity_signer

Change-Id: I6e2b654144b40573c3f3c0dc0d1c943889ffcd7d
2015-06-03 16:41:51 +00:00
Claes Elgemark ec99604b07 Strip path from verity_signer_cmd in the target-files meta data.
Strip path to be able to use outside a build e.g.
when resigning using the dist tools zip.

Change-Id: I492dcfd5791b66c17ae2e751cc8f67127e97b800
2015-06-03 15:09:54 +02:00
Adam Powell bdd5e8e7fe Initialize ro.build.version.preview_sdk
Set the initial (version 1!) value for the preview SDK version
readable by apps. If we're on a release version, force it to be 0.

Change-Id: Ib3e6cad1f59cea8e4a781827d4a35dd3620b90f1
2015-05-21 13:49:05 -07:00
Andres Morales b8876e111e [versionitis] pull image id from recovery into props
- remove root/build.prop, merge with root/default.prop

Change-Id: I913c67d948678745c0bb1b614ac10a0b7488e5c4
2015-05-08 14:46:16 -07:00
Mark Salyzyn 4660814b51 am d6d6077c: am 2f1bc255: am 8b75ec1c: Merge "disttools: add liblog, libcutils and libselinux shared libraries"
* commit 'd6d6077c999e4ef335312f2740d5d7ad20572f79':
  disttools: add liblog, libcutils and libselinux shared libraries
2015-04-15 15:28:39 +00:00
Mark Salyzyn d6d6077c99 am 2f1bc255: am 8b75ec1c: Merge "disttools: add liblog, libcutils and libselinux shared libraries"
* commit '2f1bc255fc7f0f5a8f6fd96296a119120bc04726':
  disttools: add liblog, libcutils and libselinux shared libraries
2015-04-15 15:05:55 +00:00
Mark Salyzyn c506e74dc8 disttools: add liblog, libcutils and libselinux shared libraries
Bug: 19908228
Change-Id: I48450a9fb917408cb3bc0e41d70c0593acd2b884
2015-04-14 15:17:16 -07:00
Sami Tolvanen e18196095b Merge "Separate boot and recovery image signing from dm-verity" 2015-04-10 09:44:47 +00:00
Tao Bao 65677cf0ee am 9e275b1d: am 083c1d7f: am 87df99f2: Merge "Fix the font size selection for recovery mode"
* commit '9e275b1d8b1d729761dc2e873735ea0f14c29b11':
  Fix the font size selection for recovery mode
2015-04-09 01:13:12 +00:00
Ying Wang c8a1553c3c am 58a7e3ac: am b78a6d7b: am 2594d3d1: Merge "Remove unnecessary confusing use of ."
* commit '58a7e3acacea8b458cac8d46edf084d7ddbf8ad3':
  Remove unnecessary confusing use of $(intermediate).
2015-04-09 01:13:10 +00:00
Ying Wang d9509e970c resolved conflicts for merge of 133415d5 to master
Change-Id: Iba6c1dd40e7a4c8058e7100f03296c8f72a2c949
2015-04-08 18:08:46 -07:00
Tao Bao 9e275b1d8b am 083c1d7f: am 87df99f2: Merge "Fix the font size selection for recovery mode"
* commit '083c1d7f7d0fad8ee071622caf15f02a1fcdd4b3':
  Fix the font size selection for recovery mode
2015-04-09 00:38:47 +00:00
Ying Wang 58a7e3acac am b78a6d7b: am 2594d3d1: Merge "Remove unnecessary confusing use of ."
* commit 'b78a6d7b2cc97431e666228eee5f82eec4e49be8':
  Remove unnecessary confusing use of $(intermediate).
2015-04-09 00:38:45 +00:00
Ying Wang 133415d551 am 4acabe0f: resolved conflicts for merge of f5b9830b to stage-aosp-master
* commit '4acabe0fd8778aad079ed4b3a9bbe011db12ece3':
  Better way to package up the otatools-package.
2015-04-09 00:31:56 +00:00
Tao Bao 87df99f2f6 Merge "Fix the font size selection for recovery mode" 2015-04-08 23:57:31 +00:00
Ying Wang 62925a993a Remove unnecessary confusing use of $(intermediate).
Change-Id: I0e73c3c1bf94540419e1fd227a3096da148e2459
2015-04-08 16:37:34 -07:00
Tao Bao abbc911632 Fix the font size selection for recovery mode
shamu has a 560dpi density, which is between xxhdpi and xxxhdpi. It
deserves the large font (18x32), otherwise it falls back to use the
small one and makes it mostly unreadable under recovery mode. Amend
the list to include 560dpi and 400dpi that are higher than xhdpi.
Ideally we should map string formats back to numbers for easy
comparison (and to handle any high but odd density values).

Change-Id: Ie08d9ce5e1c8850ff30a79bcbfd1b89e971b7e07
2015-04-08 15:39:33 -07:00
Rom Lemarchand f9c9266c75 Omit ramdisk from boot.img if building without ramdisk
Change-Id: I1940e3fd5f05dec555db04a556ed1fac58b2c15b
2015-04-08 15:11:47 -07:00
Ying Wang c45a47b5f3 Better way to package up the otatools-package.
With this, you can easily add more executables, jars or shared libraries
to the package. Also now it automatically takes care of
32-bit-v.s.-64-bit library issue.

Change-Id: I5afe00fadc978d0da229b192eca1a4b1c149764e
2015-04-08 12:40:37 -07:00
Sami Tolvanen 8b3f08bc7b Separate boot and recovery image signing from dm-verity
Allow dm-verity to be enabled without boot and recovery images being
signed. This makes it possible to enable only dm-verity to detect
corruption without confusing bootloaders that do not understand signed
images.

Bug: 19985143
Change-Id: Ie52c6ff595faa7a5c1f1bc1b37f6899c4d0c7001
2015-04-08 12:30:16 +01:00
Ying Wang 6494a6ef8f am 0216641e: am 6fe4ab94: am 58912c87: Merge "Don\'t fail build of otatools if there are no device certificates"
* commit '0216641e04e3eae6f3b7d50108e632b249c15f1c':
  Don't fail build of otatools if there are no device certificates
2015-04-03 17:07:37 +00:00
Ying Wang 0216641e04 am 6fe4ab94: am 58912c87: Merge "Don\'t fail build of otatools if there are no device certificates"
* commit '6fe4ab94878c7fd96ca41ac93c0684ba86e10a45':
  Don't fail build of otatools if there are no device certificates
2015-04-03 16:14:37 +00:00
Ying Wang 6fe4ab9487 am 58912c87: Merge "Don\'t fail build of otatools if there are no device certificates"
* commit '58912c874bff05e3e76ccc7b7907f628ed010bf5':
  Don't fail build of otatools if there are no device certificates
2015-04-03 16:04:43 +00:00
Ying Wang 58912c874b Merge "Don't fail build of otatools if there are no device certificates" 2015-04-03 15:57:57 +00:00
Ying Wang e183b84e11 am 4a284ac3: am da885b90: am 71d4c95f: Merge "Fix typo."
* commit '4a284ac3e04a2af8031b6ef5471db22687e5a2db':
  Fix typo.
2015-04-02 20:27:50 +00:00
Ying Wang 4a284ac3e0 am da885b90: am 71d4c95f: Merge "Fix typo."
* commit 'da885b90e4c47a0e29597da185ec95a7e4e3a73c':
  Fix typo.
2015-04-02 20:07:52 +00:00
Ying Wang da885b90e4 am 71d4c95f: Merge "Fix typo."
* commit '71d4c95f83018199b8e79d0800dd2eca80b9f728':
  Fix typo.
2015-04-02 19:57:49 +00:00
Ying Wang 36b039a2d6 Fix typo.
Change-Id: Ic934ed8610a4f03fbfb3d06dff4d911734a9d818
2015-04-02 12:48:32 -07:00
Claes Elgemark ed1158e01f Don't fail build of otatools if there are no device certificates
Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
2015-04-02 17:38:29 +00:00
Tao Bao 521a8dbd18 am 93d46584: am ae26f5b0: am 53602955: Merge "Add support to sign bootable images with vboot_signer"
* commit '93d46584170a9aae1728cdb9010eef41e25b4d4a':
  Add support to sign bootable images with vboot_signer
2015-04-01 17:33:36 +00:00
Tao Bao 93d4658417 am ae26f5b0: am 53602955: Merge "Add support to sign bootable images with vboot_signer"
* commit 'ae26f5b002de956d495c4019b365040490ff18dd':
  Add support to sign bootable images with vboot_signer
2015-04-01 17:15:29 +00:00
Tao Bao ae26f5b002 am 53602955: Merge "Add support to sign bootable images with vboot_signer"
* commit '536029551d31d8084c444063349291781ee43ae1':
  Add support to sign bootable images with vboot_signer
2015-04-01 17:05:36 +00:00
Tao Bao d95e9fd267 Add support to sign bootable images with vboot_signer
Add vboot properties to the dictionary file, which will be packed into
the target_files zip. Add support in packaging and OTA scripts to
sign the generated bootable images (boot.img and recovery.img) when
vboot is enabled.

Change-Id: I08758ced03d173219415bca762bbdb66c464a9f5
(cherry picked from commit 5d5a3bd9e8d8b14b71d1b2105417a2958d13d3d2)
2015-04-01 09:23:08 -07:00
Ying Wang b6b83e9f99 am 8853f518: am 55adb5a3: am 1b23b33d: Merge "MKBOOTIMG override were missing in two places"
* commit '8853f5181b1ae1682d9433c28e120f25f63a4721':
  MKBOOTIMG override were missing in two places
2015-03-27 17:15:46 +00:00
Ying Wang 8853f5181b am 55adb5a3: am 1b23b33d: Merge "MKBOOTIMG override were missing in two places"
* commit '55adb5a380f801038c00b2e169d33b6da93dfacc':
  MKBOOTIMG override were missing in two places
2015-03-27 16:59:35 +00:00
Ying Wang 55adb5a380 am 1b23b33d: Merge "MKBOOTIMG override were missing in two places"
* commit '1b23b33d92f32626584153739308e9147d1541bd':
  MKBOOTIMG override were missing in two places
2015-03-27 16:52:49 +00:00
Ying Wang 1b23b33d92 Merge "MKBOOTIMG override were missing in two places" 2015-03-27 16:47:15 +00:00
Ying Wang 52ea2066a1 am abc748c1: am 6ff1b035: Merge "Support to build image of root file system with /system and ramdisk combined."
* commit 'abc748c11cbba71a99f306d318c74b5336b28730':
  Support to build image of root file system with /system and ramdisk combined.
2015-03-26 17:57:22 +00:00
David Riley 17be3d3921 Add support to sign boot images with vboot.
Change-Id: I924468fe06f7d38d4fc49c2ae9dfee734fd58867
Signed-off-by: David Riley <davidriley@google.com>
(cherry picked from commit 14fb7236c1942a9f5050b3e608a0f5f4cd1cae1d)
2015-03-26 17:54:40 +00:00
Ying Wang abc748c11c am 6ff1b035: Merge "Support to build image of root file system with /system and ramdisk combined."
* commit '6ff1b0357289c1ef1a7aa9294aae748dacb69866':
  Support to build image of root file system with /system and ramdisk combined.
2015-03-26 17:50:10 +00:00
Ying Wang a2292c94d1 Support to build image of root file system with /system and ramdisk combined.
Added support to build system.img that combines contents of /system and
the ramdisk, and can be mounted at the root of the file system.
To enable this feature, define BoardConfig.mk variable:
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true

Ideally we would just change TARGET_OUT (the path of the staging system
directory) to under TARGET_ROOT_OUT. But at this point many places in
the build system assume TARGET_OUT is independent of TARGET_ROOT_OUT and
we can't make it easily configurable.
Instead this implementation takes the least intrusive approach:
We don't change TARGET_OUT or TARGET_ROOT_OUT. We just assemble a
temporary staging directory that contains contents of both TARGET_OUT
and TARGET_ROOT_OUT, in build_image.BuildImage() of
tools/releasetools/build_image.py.
When build_image.py is directly called from the makefile, we pass in the
parameters from the global dictionary; when build_image.BuildImage() is
called from add_img_to_target_files.py, we need to override values to
point to files extracted from the target_files zip file.
We need to combine the fs_config files of both /system and ramdisk,
when fs_config is enabled.

Also this change refactored build_image.BuildImage() by moving the extra
parameters to the image property dictionary.

(cherry-picked from commit 0eabd4f2c5)

Bug:19868522
Change-Id: Iafc467a0e3427b0d6ad3b575abcc98ddcc9ea0f1
2015-03-26 10:35:00 -07:00
Per Astrand cab6699160 MKBOOTIMG override were missing in two places
The change follows the patten found in "Package OTA" and other places
to allow for overriding the mkbootimg command.

Now pass MKBOOTIMG variable to get make_recovery_patch and add_image_to_target
to use the tool set in BOARD_CUSTOM_MKBOOTIMG for boot/recovery image
generation.

Change-Id: I78533c25e87c2750eb24ac1bf39e4b7ca321a441
2015-03-25 16:02:50 +01:00
Ying Wang 0eabd4f2c5 Support to build image of root file system with /system and ramdisk combined.
Added support to build system.img that combines contents of /system and
the ramdisk, and can be mounted at the root of the file system.
To enable this feature, define BoardConfig.mk variable:
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true

Ideally we would just change TARGET_OUT (the path of the staging system
directory) to under TARGET_ROOT_OUT. But at this point many places in
the build system assume TARGET_OUT is independent of TARGET_ROOT_OUT and
we can't make it easily configurable.
Instead this implementation takes the least intrusive approach:
We don't change TARGET_OUT or TARGET_ROOT_OUT. We just assemble a
temporary staging directory that contains contents of both TARGET_OUT
and TARGET_ROOT_OUT, in build_image.BuildImage() of
tools/releasetools/build_image.py.
When build_image.py is directly called from the makefile, we pass in the
parameters from the global dictionary; when build_image.BuildImage() is
called from add_img_to_target_files.py, we need to override values to
point to files extracted from the target_files zip file.
We need to combine the fs_config files of both /system and ramdisk,
when fs_config is enabled.

Also this change refactored build_image.BuildImage() by moving the extra
parameters to the image property dictionary.

Bug:19868522
Change-Id: Iafc467a0e3427b0d6ad3b575abcc98ddcc9ea0f1
2015-03-24 21:07:42 -07:00
Dan Albert 169f16f808 am fd496a64: am c70805ee: Merge "Set up environmental variable PATH before calling releasetools scripts."
* commit 'fd496a64277e331487048acee586da6ad5d02870':
  Set up environmental variable PATH before calling releasetools scripts.
2015-03-13 23:29:02 +00:00
Dan Albert ba64cebf14 am 7c4a3464: am fcd0d98b: Merge "include oem.prop files in otatools_package"
* commit '7c4a34642aecebb35845345cc86dfe63c86936f5':
  include oem.prop files in otatools_package
2015-03-13 23:29:00 +00:00
Dan Albert fd496a6427 am c70805ee: Merge "Set up environmental variable PATH before calling releasetools scripts."
* commit 'c70805eef5be3e10003518d24adb083dcd1efbc2':
  Set up environmental variable PATH before calling releasetools scripts.
2015-03-13 23:21:21 +00:00
Dan Albert 7c4a34642a am fcd0d98b: Merge "include oem.prop files in otatools_package"
* commit 'fcd0d98b6cedde450a6e4d62df2209d8295752fc':
  include oem.prop files in otatools_package
2015-03-13 23:21:20 +00:00
Dan Albert c856bcb9c8 am 4cdf1357: Merge "add otatools-package target"
* commit '4cdf1357433b407b350517779248e2194c88c3f4':
  add otatools-package target
2015-03-13 21:10:49 +00:00
Ying Wang 95a543c987 Set up environmental variable PATH before calling releasetools scripts.
Some releasetools python sripts rely on $PATH to search for the
executables. With this change, you don't need to run lunch even after you
change the build system variable OUT_DIR.

Bug: 19320328
Change-Id: Ia44b11084fb1bdcceb60b1d33cb7e460c9b705a8
(cherry picked from commit 9d252e1009)
2015-03-13 11:36:15 -07:00
Doug Zongker b2cdb1cca5 include oem.prop files in otatools_package
Change-Id: I2f28936edda5d8d9bff6213828c16d607263cd95
(cherry picked from commit ce43bc8df2)
2015-03-13 11:36:15 -07:00
Doug Zongker 0c6c03269e 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: If14b4afefcc1a20ea19dfca3f3b9f9fae73189a6
(cherry picked from commit f22b0f43ef)
2015-03-13 11:36:14 -07:00
Jesse Zhao f749b4b664 DO NOT MERGE: Bundle libc++.so into otatools-package.
Change-Id: I6b7d16eca18dce3e2990464f3d1a34740ad8a8ee
(cherry picked from commit f7daa92cff)
2015-03-13 11:36:14 -07:00
Sami Tolvanen 8cdf72066b Merge "Change transfer list format to include block hashes" 2015-03-13 11:02:02 +00:00
Ying Wang 437e43b555 Use "rsync -a" to copy over $(TARGET_ROOT_OUT) to $(TARGET_RECOVERY_OUT)
"cp -Rf" fails on Mac OS when some broken symlinks exist in the dest
dir.
Also switch to better shell error handling when copying
init.recovery.*.rc.

Change-Id: Idd05f7604736b234619f62be12dd108fac91fed1
2015-03-11 16:55:33 -07:00
Ying Wang 83a1934085 Use "rsync -a" to copy over $(TARGET_ROOT_OUT) to $(TARGET_RECOVERY_OUT)
"cp -Rf" fails on Mac OS when some broken symlinks exist in the dest
dir.
Also switch to better shell error handling when copying
init.recovery.*.rc.

Change-Id: Idd05f7604736b234619f62be12dd108fac91fed1
2015-03-11 16:48:01 -07:00
Ying Wang f25838a7ea Support modules to be installed directly to recovery.img
Previously the recovery binary was configured to be installed to the
system.img and then got copied to recovery.img in the recovery.img's
build rule.
With this change, a module, such as the recovery binary, can configure
itself to be installed directly to the recovery.img, just like how other
modules get installed to system.img.

Bug: 19667686
Change-Id: I46b0b4a95cf078a68999db9c0f6635d6a3f5cd86
2015-03-11 10:38:13 -07:00
Sami Tolvanen dd67a295cc Change transfer list format to include block hashes
Add source and target block hashes as parameters to transfer list
commands that copy or patch data to a partition. This allows the
updater to verify the status of each command in the transfer list
and makes resuming block based OTAs possible. Due to the changes,
update the transfer list version to 3.

Needs matching changes from
  I1e752464134aeb2d396946348e6041acabe13942

Bug: 18262110
Change-Id: Ia5c56379f570047f10f0aa7373a1025439495c98
(cherry picked from commit cac671a9d1)
2015-03-11 17:22:06 +00:00
Ying Wang 3752614de1 Support modules to be installed directly to recovery.img
Previously the recovery binary was configured to be installed to the
system.img and then got copied to recovery.img in the recovery.img's
build rule.
With this change, a module, such as the recovery binary, can configure
itself to be installed directly to the recovery.img, just like how other
modules get installed to system.img.

Bug: 19667686
Change-Id: I46b0b4a95cf078a68999db9c0f6635d6a3f5cd86
2015-03-10 12:02:57 -07:00
Mohamad Ayyash 9b19382f0e resolved conflicts for merge of fc759204 to stage-aosp-master
Change-Id: Icf58e881286a66cb3ca4cb122fa8c11ec217fbab
2015-03-04 15:43:45 -08:00
Mohamad Ayyash b97746ef09 Allow flashing a squashfs system image
Change-Id: Ic51d11274784a8d2e9d57d5f0b821ebc89680e5a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-03-03 18:54:50 -08:00
Mohamad Ayyash 6894695819 Allow flashing a squashfs system image
Change-Id: Ic51d11274784a8d2e9d57d5f0b821ebc89680e5a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-03-03 15:14:37 -08:00
Ying Wang c894e099d3 resolved conflicts for merge of 641e283f to master
Change-Id: I9c5d9dd9f0f8c9206112f4c2f773ed81c9c2f06f
2015-02-26 10:34:33 -08:00
Ying Wang 8485fb074b am 4eec22a6: Merge "Use a less freqent dummy file name: zipdummy"
* commit '4eec22a6627927aaa11a67e3e18d36534af81856':
  Use a less freqent dummy file name: zipdummy
2015-02-26 18:04:07 +00:00
Ying Wang dcd90831e5 Use a less freqent dummy file name: zipdummy
Previously if user has a directory with name dummy in the root of the
source tree, "zip -qd package.apk dummy" fails with:
"zip error: Nothing to do!".
This change mitigates the error.

Change-Id: I642e3bf0378e5b9911a068ecb72f795b3e92f1fe
2015-02-26 09:36:27 -08:00
JP Abgrall 69d8279048 am 92e0682f: resolved conflicts for merge of 7fc55db3 to lmp-mr1-dev-plus-aosp
* commit '92e0682f05cafa5b67e2a1cfe7c5dd75db037db3':
  core: remove dependencies on genext2fs
2015-02-12 17:27:04 +00:00
JP Abgrall 92e0682f05 resolved conflicts for merge of 7fc55db3 to lmp-mr1-dev-plus-aosp
Change-Id: I27b9c65d654d4cc8b806043de0ebaa5dbf7b7a7c
2015-02-11 20:05:03 -08:00
JP Abgrall 7bb75e4f6c core: remove dependencies on genext2fs
We don't use EXT2 for bootimage anymore.
This will allow getting rid of external/genext2fs

Bug: 19282953
Change-Id: Ie56528c7877036d2501a09888a4420637f9cd647
2015-02-11 15:04:59 -08:00
Andres Morales 4978192ae0 am 89a87488: am b5df7d48: Merge "Add version strings from android-info.txt into build.prop"
* commit '89a87488db537eb6c78e6cd5d58ef32fcadc523d':
  Add version strings from android-info.txt into build.prop
2015-02-11 02:50:06 +00:00
Andres Morales 89a87488db am b5df7d48: Merge "Add version strings from android-info.txt into build.prop"
* commit 'b5df7d483772d1dd08a1d5c8614f38a79e43ec12':
  Add version strings from android-info.txt into build.prop
2015-02-10 16:52:58 +00:00
Ying Wang 9d252e1009 Set up environmental variable PATH before calling releasetools scripts.
Some releasetools python sripts rely on $PATH to search for the
executables. With this change, you don't need to run lunch even after you
change the build system variable OUT_DIR.

Bug: 19320328
Change-Id: Ia44b11084fb1bdcceb60b1d33cb7e460c9b705a8
2015-02-09 17:20:06 -08:00
Andres Morales b5df7d4837 Merge "Add version strings from android-info.txt into build.prop" 2015-02-09 22:45:57 +00:00
Andres Morales 085a0ce756 Add version strings from android-info.txt into build.prop
Allows runtime checking of expected baseband/bootloader.

Change-Id: Iccb053fee5f72f4e082a5c3482c0710b13ee7eb8
2015-02-09 08:33:31 -08:00
Andres Morales 5038247772 am 8859f029: am b998054f: Merge "Add system/build.prop dependency on vendor/bootimg"
* commit '8859f0294979d7be169abe2787ad84044b6714f2':
  Add system/build.prop dependency on vendor/bootimg
2015-02-06 18:29:24 +00:00
Andres Morales 8859f02949 am b998054f: Merge "Add system/build.prop dependency on vendor/bootimg"
* commit 'b998054f50043c23e8599ee3cfae058ac378c5cb':
  Add system/build.prop dependency on vendor/bootimg
2015-02-06 18:23:12 +00:00
Andres Morales b998054f50 Merge "Add system/build.prop dependency on vendor/bootimg" 2015-02-06 18:11:30 +00:00
Sami Tolvanen 431d42f857 Merge "Change transfer list format to include block hashes" 2015-02-06 10:27:11 +00:00
Andres Morales a09f2f44cc Add system/build.prop dependency on vendor/bootimg
When incremental builds only affect the system partition,
the build.prop file for other partitions might go out of
date.

Add a dependency on system/build.prop s.t. when
it's rebuilt,
the fingerprints are updated on the other
partition's build.prop's.

Bug:19058575
Change-Id: Iea7b761e0800c402eb4ce1154e8f6af5a17f7b06
2015-02-05 12:42:43 -08:00
Elliott Hughes a7442d5219 am 1888ab84: am 9edd7649: Merge "Remove mkyaffs2image references."
* commit '1888ab842a4308c3898beec434ac59bcda12617b':
  Remove mkyaffs2image references.
2015-02-05 20:16:00 +00:00
Elliott Hughes 1888ab842a am 9edd7649: Merge "Remove mkyaffs2image references."
* commit '9edd76494d4378bd740dd22a2eb4f5d0eb0db40f':
  Remove mkyaffs2image references.
2015-02-05 18:47:25 +00:00
Elliott Hughes 65d4186f85 Remove mkyaffs2image references.
Change-Id: I1d112515bc92353a5b48ec668e1cadfb51ecdaad
2015-02-04 19:58:09 -08:00
Ying Wang 38a9d5a739 am 10500d0e: resolved conflicts for merge of 5cb4276e to lmp-mr1-dev-plus-aosp
* commit '10500d0ea7706a6a137e8afdd347d927f5512488':
  Add target recoveryimage-nodeps.
2015-01-31 02:00:26 +00:00
Ying Wang 10500d0ea7 resolved conflicts for merge of 5cb4276e to lmp-mr1-dev-plus-aosp
Change-Id: Ia7f011f24276e7e8e045a2544e5dff2b758b1c62
2015-01-30 16:57:37 -08:00
Ying Wang 747b9f18f0 Add target recoveryimage-nodeps.
Change-Id: Ie7d11ae8f40260bf23481931c18523895c87ebd7
2015-01-30 14:16:00 -08:00
Sami Tolvanen cac671a9d1 Change transfer list format to include block hashes
Add source and target block hashes as parameters to transfer list
commands that copy or patch data to a partition. This allows the
updater to verify the status of each command in the transfer list
and makes resuming block based OTAs possible. Due to the changes,
update the transfer list version to 3.

Needs matching changes from
  I1e752464134aeb2d396946348e6041acabe13942

Bug: 18262110
Change-Id: Ia5c56379f570047f10f0aa7373a1025439495c98
2015-01-30 11:34:27 +00:00
Ying Wang 15afffebc3 am cf1f7bc9: am 1bc2c6af: Merge "Allow to build "winsdk-tools" alone."
* commit 'cf1f7bc93297213811036cf331bc7ecce32119e7':
  Allow to build "winsdk-tools" alone.
2015-01-28 00:42:20 +00:00
Ying Wang cf1f7bc932 am 1bc2c6af: Merge "Allow to build "winsdk-tools" alone."
* commit '1bc2c6af5b73d6d448452b8bcb75222fbc81a532':
  Allow to build "winsdk-tools" alone.
2015-01-27 22:13:25 +00:00
Ying Wang ff1fe68514 Allow to build "winsdk-tools" alone.
Allow to run "make winsdk-tools" without building the full win_sdk.

Bug: 19149444
Change-Id: If98495035f4f84dbcab7af2a74434e589bbfd4d1
2015-01-27 22:01:12 +00:00
Narayan Kamath 41759234f0 am 675a726f: resolved conflicts for merge of 8f5fc9e2 to lmp-mr1-dev-plus-aosp
* commit '675a726fe4ca70beb1ecccb8c5f78dcc8f65cac8':
  Add ro.product.locale
2015-01-22 19:58:04 +00:00
Narayan Kamath 675a726fe4 resolved conflicts for merge of 8f5fc9e2 to lmp-mr1-dev-plus-aosp
Change-Id: Ie1587a4e2434b9cfbca16bc764e99e94511f8212
2015-01-22 18:53:59 +00:00
Narayan Kamath 8f5fc9e246 Merge "Add ro.product.locale" 2015-01-22 14:04:53 +00:00
Narayan Kamath baf3eb93ee Add ro.product.locale
This is a BCP-47 language tag representing the default locale for a
given device. Support for the earlier mechanism of supplying a language
and region via ro.product.locale.region/language has been removed. This
change also removes support for supplying these properties via
PRODUCT_ADDITIONAL_PROPERTY_OVERRIDES. Devices that need to override
this should either rearrange their PRODUCT_LANGUAGES or supply a custom
.prop file.

bug: 17691569

Change-Id: I00c74098542b49b9c514a6ca39ea8d08179546c1
2015-01-16 10:16:52 +00:00
Andres Morales 1ea1d64771 am 121e53ca: am e1f21520: Merge "Add build.prop to root ramdisk"
* commit '121e53cace8f2cea7b847c5efacfba06325e59f0':
  Add build.prop to root ramdisk
2015-01-15 02:27:41 +00:00
Andres Morales 121e53cace am e1f21520: Merge "Add build.prop to root ramdisk"
* commit 'e1f2152015069b595f9f62f8b74e26baa5ebad9d':
  Add build.prop to root ramdisk
2015-01-14 16:09:01 +00:00
Andres Morales 9c820f82c4 Add build.prop to root ramdisk
will be used for verifying installed bootimage

Change-Id: Iaf80823545980fb2e464a558e918715cc1b82e11
2015-01-13 17:55:09 -08:00
Jesse Zhao f7daa92cff DO NOT MERGE: Bundle libc++.so into otatools-package.
Change-Id: I6b7d16eca18dce3e2990464f3d1a34740ad8a8ee
2014-12-10 19:20:22 +00:00
Ying Wang dee5dff3f4 am c6f3273d: am be66d9f0: am 27eba54b: Add system propery ro.build.flavor.
* commit 'c6f3273db3fe5c09a93fa04e49c52d89a322d1b3':
  Add system propery ro.build.flavor.
2014-12-09 00:56:58 +00:00
Ying Wang c6f3273db3 am be66d9f0: am 27eba54b: Add system propery ro.build.flavor.
* commit 'be66d9f09ada756a95a9efd3b67040a81b3322d1':
  Add system propery ro.build.flavor.
2014-12-08 19:12:15 +00:00
Adam Lesinski ec792e5f39 am 82a033f8: am c2b74b87: am 57a3d3e1: Merge "Remove uses of density in PRODUCT_AAP_CONFIG" into lmp-mr1-dev
* commit '82a033f89c257ad72dbf175c3f145ae676958d87':
  Remove uses of density in PRODUCT_AAP_CONFIG
2014-12-05 00:13:49 +00:00
Ying Wang 27eba54b20 Add system propery ro.build.flavor.
ro.build.flavor is set to "$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)" in
system.img build.prop at build time,
and it won't be overridden by oem partition's build.prop.

Bug: 18605832
Change-Id: Ic917623dd43b74d9c601119db0b457483e8c4472
2014-12-04 15:19:08 -08:00
Adam Lesinski 82a033f89c am c2b74b87: am 57a3d3e1: Merge "Remove uses of density in PRODUCT_AAP_CONFIG" into lmp-mr1-dev
* commit 'c2b74b87d4ea4bcdef228080a874bad4aca7c323':
  Remove uses of density in PRODUCT_AAP_CONFIG
2014-12-04 21:46:56 +00:00
Adam Lesinski 83ee6d790f Remove uses of density in PRODUCT_AAP_CONFIG
Change-Id: I98594165515c07fa2e6b847266f7d8fa3283b52e
2014-12-03 15:20:51 -08:00
Ying Wang e91b83d5e6 Support journal size board config variables.
A device can set up BOARD_SYSTEMIMAGE_JOURNAL_SIZE (number of journal blocks)
in its BoardConfig.mk.
To disable journaling, set "BOARD_SYSTEMIMAGE_JOURNAL_SIZE := 0".

BOARD_VENDORIMAGE_JOURNAL_SIZE and BOARD_OEMIMAGE_JOURNAL_SIZE work in
similar way.

Bug: 18430740

(cherry picked from commit f3b86357e2)

Change-Id: Icc6c7e1b3be25b8e21b6a737492d944428e4a35a
2014-11-19 13:48:30 -08:00
Ying Wang 1daf164ab1 am f1021dcb: am 6ead56be: am f3b86357: Support journal size board config variables.
* commit 'f1021dcb61e1c2a3604093c4aac4c1d2984cb6ac':
  Support journal size board config variables.
2014-11-19 19:32:34 +00:00
Ying Wang f1021dcb61 am 6ead56be: am f3b86357: Support journal size board config variables.
* commit '6ead56bed56e3927575726bdebf8511e44f6fb47':
  Support journal size board config variables.
2014-11-19 19:28:23 +00:00
Ying Wang f3b86357e2 Support journal size board config variables.
A device can set up BOARD_SYSTEMIMAGE_JOURNAL_SIZE (number of journal blocks)
in its BoardConfig.mk.
To disable journaling, set "BOARD_SYSTEMIMAGE_JOURNAL_SIZE := 0".

BOARD_VENDORIMAGE_JOURNAL_SIZE and BOARD_OEMIMAGE_JOURNAL_SIZE work in
similar way.

Bug: 18430740
Change-Id: I0594814fe19ffc54dff41ec2464e2e3a802b9419
2014-11-18 18:19:43 -08:00
Paul Lawrence 8d566e1b5c am fb441593: am 9ebb0067: am a37b2bb2: Fix the build
* commit 'fb4415934cb611f6a2941257aa498ed8701ec16b':
  Fix the build
2014-11-14 19:18:47 +00:00
Paul Lawrence fb4415934c am 9ebb0067: am a37b2bb2: Fix the build
* commit '9ebb00679946cda44c5abdadaafa6c45b2cdcb29':
  Fix the build
2014-11-14 02:18:23 +00:00
Paul Lawrence a37b2bb236 Fix the build
Bug: 15984840
Bug: 18120110
Change-Id: I0224d5a31e03b711953d9496ecb00b6d88b8ef4c
2014-11-14 02:04:33 +00:00
Sami Tolvanen 5132315546 am 2a1697d9: am 8d212ea8: DO NOT MERGE: Change verity key formats
* commit '2a1697d9831fc887a32c661fa4e3758f32790e67':
  DO NOT MERGE: Change verity key formats
2014-11-14 00:03:51 +00:00
Sami Tolvanen 8d212ea873 DO NOT MERGE: Change verity key formats
Change boot, recovery, and verity metadata signing keys to use the
same PKCS8 / X.509 PEM format as the other signing keys, and update
build scripts to use correct arguments for the updated signing
tools.

Bug: 15984840
Bug: 18120110
Change-Id: I23ed5a004ecdad6cf7696487935ad5031eb8adf8
(cherry picked from commit 72d90eb189)
2014-11-13 23:23:31 +00:00
Sami Tolvanen d5f799d181 Merge "Change verity key formats" 2014-11-13 17:12:27 +00:00
Greg Hartman 66aadaac60 am 089d7572: am 9f00b5a0: Restore the diskinstaller dependency, since it\'s needed for GCE. automerge: 2ebfef4
* commit '089d75728ad9498833aef07e19112d2e7321f523':
  Restore the diskinstaller dependency, since it's needed for GCE.
2014-11-11 03:01:50 +00:00
Greg Hartman 2dd7db8883 am 5c5b443f: am 711fe355: Add a hook for the syslinux bootloader. automerge: 4c46710
* commit '5c5b443f91da85b84bec36a78dff223ec8b2b3fe':
  Add a hook for the syslinux bootloader.
2014-11-11 03:01:49 +00:00
Greg Hartman 089d75728a am 9f00b5a0: Restore the diskinstaller dependency, since it\'s needed for GCE. automerge: 2ebfef4
* commit '9f00b5a077afa9f1cc77ac9bd4e8edc9d9464ae2':
  Restore the diskinstaller dependency, since it's needed for GCE.
2014-11-11 02:55:16 +00:00
Greg Hartman 5c5b443f91 am 711fe355: Add a hook for the syslinux bootloader. automerge: 4c46710
* commit '711fe35574d5c2f7a668db1ca69a0ce13362fd31':
  Add a hook for the syslinux bootloader.
2014-11-11 02:55:15 +00:00
Greg Hartman 2ebfef4484 Restore the diskinstaller dependency, since it's needed for GCE.
Change-Id: Ieb2695afbe551e829357bad56d5fe1501165b495
2014-11-11 02:27:46 +00:00
Greg Hartman 4c46710e7a Add a hook for the syslinux bootloader.
Change-Id: Ia8638e9dcb025743a66c52ad43b161ee70602c89
2014-11-11 02:26:50 +00:00
Sami Tolvanen 72d90eb189 Change verity key formats
Change boot, recovery, and verity metadata signing keys to use the
same PKCS8 / X.509 PEM format as the other signing keys, and update
build scripts to use correct arguments for the updated signing
tools.

Change-Id: I23ed5a004ecdad6cf7696487935ad5031eb8adf8
2014-11-06 20:40:07 -08:00
Ying Wang 83cd45517d Store symbols.zip in apps_only build. automerge: a60fb49
automerge: a73b611

* commit 'a73b611e6b2a626b144170f15509e02f3318976e':
  Store symbols.zip in apps_only build.
2014-10-28 03:36:22 +00:00
Ying Wang a73b611e6b Store symbols.zip in apps_only build.
automerge: a60fb49

* commit 'a60fb49704946b9d5cf0551ddd56bd1072131b85':
  Store symbols.zip in apps_only build.
2014-10-28 00:15:59 +00:00
Ying Wang a60fb49704 Store symbols.zip in apps_only build.
Bug: 18103055
Change-Id: I0eb335e944138b0edc3050d19c076891f499a07c
2014-10-27 17:57:11 +00:00
Ying Wang da3b972603 Store symbols.zip in apps_only build.
Bug: 18103055
Change-Id: I0eb335e944138b0edc3050d19c076891f499a07c
2014-10-24 11:36:59 -07:00
JP Abgrall c55943c2f5 am 9bd1c566: am 775b1abb: core: Fixup bad ext4 mount options for recovery (pick common denominator) automerge: 620e409
* commit '9bd1c56603ef7f651508e13af2ffd82b7b192f5a':
  core: Fixup bad ext4 mount options for recovery (pick common denominator)
2014-10-24 03:28:36 +00:00
JP Abgrall 9bd1c56603 am 775b1abb: core: Fixup bad ext4 mount options for recovery (pick common denominator)
automerge: 620e409

* commit '620e409127c6b13d72211251a8a5e92513d04693':
  core: Fixup bad ext4 mount options for recovery (pick common denominator)
2014-10-24 03:24:41 +00:00
JP Abgrall 620e409127 am 775b1abb: core: Fixup bad ext4 mount options for recovery (pick common denominator)
* commit '775b1abb12a5d891ac66b51d28381692bde6ab03':
  core: Fixup bad ext4 mount options for recovery (pick common denominator)
2014-10-24 02:57:34 +00:00
JP Abgrall 775b1abb12 core: Fixup bad ext4 mount options for recovery (pick common denominator)
Some ext4 options were not suitable for all kernel versions.
The current option were checked against kernels 3.0 3.4 3.10.

Bug: 18092222
Change-Id: I30883706e5c8ac7a318f4b448d4becde50de808f
2014-10-23 16:27:03 -07:00
JP Abgrall 78a6a5b38c am 79804fea: am 4f072e14: am 7bd80ca6: Merge "core: Let the build specify mount options for recovery" into lmp-dev
* commit '79804fea52dc6fbf258ed45312a8bfbd2d46fe6f':
  core: Let the build specify mount options for recovery
2014-10-23 22:27:21 +00:00
JP Abgrall 79804fea52 am 4f072e14: am 7bd80ca6: Merge "core: Let the build specify mount options for recovery" into lmp-dev
* commit '4f072e140bba2422eae14270f22174398a86a0ba':
  core: Let the build specify mount options for recovery
2014-10-23 22:20:08 +00:00
JP Abgrall 4f072e140b am 7bd80ca6: Merge "core: Let the build specify mount options for recovery" into lmp-dev
* commit '7bd80ca6ea2b0c5c39bdb05013fb3d0188fbcfa8':
  core: Let the build specify mount options for recovery
2014-10-23 21:57:11 +00:00
JP Abgrall 6ea5bd626c core: Let the build specify mount options for recovery
Currently recovery install/patch will mount /system++ with only default
options.
The default options are not very suitable for dealing with crashes.
We now use
 TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS
that can specify which mount options to use for a given fs-type.
  # <fstype>=<fstype_opts>[|<fstype_opts>]...
  # fstype_opts := <opt>[,<opt>]...
  #         opt := <name>[=<value>]
If only defaults are to be used, then the BoardConfig.mk can just have
an empty (must have ""):
 TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS := ""

The default is
 "ext4=match_batch_time=0,commit=1,data=journal,barrier=1,errors=panic,nodelalloc"

The release tools will pick them up with
  https://googleplex-android-review.git.corp.google.com/#/c/573628

Bug: 18092222
Change-Id: Iaa59099b0edf5af8835d1862fada089cff58882c
2014-10-23 17:54:01 +00:00
Narayan Kamath f7fa256321 am 75635a16: am aec004e6: resolved conflicts for merge of 1a856098 to lmp-mr1-dev
* commit '75635a1689da4b535f7cca9ff997adfe9a76c7e0':
  Export build thumbprint only if the product has specified at least one oem fingerprint property
2014-10-09 22:31:07 +00:00
Narayan Kamath 75635a1689 am aec004e6: resolved conflicts for merge of 1a856098 to lmp-mr1-dev
* commit 'aec004e66c5b6bdb11e92a4acd329653128fa216':
  Export build thumbprint only if the product has specified at least one oem fingerprint property
2014-10-09 22:23:42 +00:00
Narayan Kamath aec004e66c resolved conflicts for merge of 1a856098 to lmp-mr1-dev
Change-Id: Id2ef023078a251cc58450d457f5b20261e2851a3
2014-10-09 13:58:05 +01:00
Ying Wang cc9e30ef35 am 1a856098: Merge "Export build thumbprint only if the product has specified at least one oem fingerprint property" into lmp-dev
* commit '1a856098ea819a75ad904ff6d6dcfac9545a02a6':
  Export build thumbprint only if the product has specified at least one oem fingerprint property
2014-10-08 16:38:40 +00:00
Ying Wang e24e17a976 Export build thumbprint only if the product has specified at least one oem fingerprint property
Bug: 17888863
Change-Id: I4d12bc977dcb5e8e1858efb2a395466d8779de34
2014-10-07 18:59:47 -07:00
Ying Wang 48cc9fc4eb am 9a62f7d0: am 2a8015fa: am c168b6e2: Merge "the recovery image also needs to be signed with " into lmp-dev
* commit '9a62f7d013f9de537b262cb3154aef24090fe1b0':
  the recovery image also needs to be signed with $(BOOT_SIGNER)
2014-10-01 17:08:23 +00:00
Ying Wang 9a62f7d013 am 2a8015fa: am c168b6e2: Merge "the recovery image also needs to be signed with " into lmp-dev
* commit '2a8015fad6b45f5adbcf0fc744502109c902bf76':
  the recovery image also needs to be signed with $(BOOT_SIGNER)
2014-10-01 17:03:53 +00:00
Ying Wang 2a8015fad6 am c168b6e2: Merge "the recovery image also needs to be signed with " into lmp-dev
* commit 'c168b6e27aa48c1d5552ed9143eeb00d2c9860a5':
  the recovery image also needs to be signed with $(BOOT_SIGNER)
2014-10-01 15:16:46 +00:00
Ying Wang 912eb7155b am c168b6e2: Merge "the recovery image also needs to be signed with " into lmp-dev
* commit 'c168b6e27aa48c1d5552ed9143eeb00d2c9860a5':
  the recovery image also needs to be signed with $(BOOT_SIGNER)
2014-09-30 16:50:04 +00:00
Andrew Boie 194418c3e1 the recovery image also needs to be signed with $(BOOT_SIGNER)
Change-Id: Ie90976afdaada6410b1566fe497ce86ee935ad41
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Reviewed-on: https://android.intel.com/232319
2014-09-28 10:48:50 -07:00
Doug Zongker cd07ba97d6 am 0529b668: store supported versions of blockimgdiff in misc_info
* commit '0529b668f3c03b9f64618dac8c9d1e58c0498537':
  store supported versions of blockimgdiff in misc_info
2014-09-26 14:54:00 +00:00
Doug Zongker 0529b668f3 store supported versions of blockimgdiff in misc_info
Change-Id: Ibe14307aa49ffa75c9d69fb7bbdcb306780d74b4
2014-09-25 16:42:53 -07:00
Ying Wang d7b3c2c595 am b4c83767: am a7ee956e: am b69b7d7f: Merge "Fix recovery image build for 32p"
* commit 'b4c837672fe730652e4c7d32bea1f9e7673d180b':
  Fix recovery image build for 32p
2014-09-20 03:20:12 +00:00
Ying Wang b4c837672f am a7ee956e: am b69b7d7f: Merge "Fix recovery image build for 32p"
* commit 'a7ee956e9dc20fa5a01606b473b18b0c3980762f':
  Fix recovery image build for 32p
2014-09-20 03:01:28 +00:00
Ying Wang 0379e9f83f am a7ee956e: am b69b7d7f: Merge "Fix recovery image build for 32p"
* commit 'a7ee956e9dc20fa5a01606b473b18b0c3980762f':
  Fix recovery image build for 32p
2014-09-20 01:06:48 +00:00
Ying Wang b69b7d7fba Merge "Fix recovery image build for 32p" 2014-09-20 00:38:08 +00:00
Vineeta Srivastava 5cb80db37d am cfbd193d: am 2726211a: Set oem_fingerprint_properties only when it is not empty.
* commit 'cfbd193d354dd9bf33148919a4a82678ed81578b':
  Set oem_fingerprint_properties only when it is not empty.
2014-09-19 08:32:04 +00:00
Vineeta Srivastava 2726211a7c Set oem_fingerprint_properties only when it is not empty.
Add oem_fingerprint_properties to misc_info.txt only when it is not empty.
Shamu does not have OEM specific OTA config and oem_fingerprint_properties
does not need to be set in misc_info.txt.

For sprout, it stays the same.

Bug: 16635599
Change-Id: I7e6c6f5ce1f94f8f1b6da0c2f56bc67ff9fc0f1c
2014-09-18 14:42:28 -07:00
Bruce Beare 7c02ec91e8 Fix recovery image build for 32p
When building for 32p, we need to be explicit that we wish to build the 32bit
version of the binaries that will be placed in the recovery image. The recovery
image doesn't actually care... but if we are not explicit in this, the makefiles
will ask for the 64bit binaries but the Android.mk for the binaries will supply
the 32bit images (causing the build to fail)..

Change-Id: I728912bc8e07726888fe8bed4352cbb373911cb7
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2014-09-15 18:36:47 -07:00
Dan Albert 6692715135 Missed one part of removing the vbox target.
Change-Id: I8edb5252b5e71de042b79cb9eb2a497d89efb773
(cherry picked from commit bfbd41edcb)
2014-09-11 13:48:50 -07:00
Dan Albert 23c5f0e495 am 588011a9: am 5f8e7ff6: am 1feb478d: Merge "Missed one part of removing the vbox target."
* commit '588011a9051eb336a3d562be294f70098741221a':
  Missed one part of removing the vbox target.
2014-09-11 17:28:49 +00:00
Dan Albert 588011a905 am 5f8e7ff6: am 1feb478d: Merge "Missed one part of removing the vbox target."
* commit '5f8e7ff67602a1ac14994c4aad6fd5d194b68d57':
  Missed one part of removing the vbox target.
2014-09-11 02:54:57 +00:00
Dan Albert bfbd41edcb Missed one part of removing the vbox target.
Change-Id: I8edb5252b5e71de042b79cb9eb2a497d89efb773
2014-09-10 15:58:20 -07:00
Doug Zongker a7eba15e76 am d68530ba: am 85448773: select default search_path by platform
* commit 'd68530ba9ac7563487ff4a9e1527db1e2e3f88be':
  select default search_path by platform
2014-09-10 01:00:52 +00:00
Doug Zongker 8544877399 select default search_path by platform
Bug: 17443175
Change-Id: I2b8b0a3b56e667b749ac167a6d09dc973ecf8419
2014-09-09 15:11:13 -07:00
Doug Zongker 82ba98de48 store supported versions of blockimgdiff in misc_info
Change-Id: Idfbcf4b4435e1300a6dde52dd6cb675f0d85ca79
2014-09-08 16:02:02 -07:00
Ying Wang d2ab2362b1 am 53bb20ae: am abc3fbe6: Merge "Run device-specific tasks at the end of Makefile." into lmp-dev
* commit '53bb20ae104bcb9ed853bfcd97d229bbfeca2949':
  Run device-specific tasks at the end of Makefile.
2014-09-06 23:20:50 +00:00
Ying Wang 66c78e46d2 Run device-specific tasks at the end of Makefile.
This allows us to add device-specific tasks.

Bug: 17406520
Change-Id: If23a6d530104a8dc3eeaf8215d8d41a6847f4645
2014-09-05 17:47:34 -07:00
Doug Zongker 4d0bfb4f40 remove unused xdelta3/xz utilities
This was part of the original block-based OTA mechanism.

Bug: 16987495
Change-Id: I5bd6599829ee6084a8da1f0b14af87aabf07c130
2014-08-26 13:11:56 -07:00
Doug Zongker 845929b40b Merge "remove unused xdelta3/xz utilities" 2014-08-26 17:05:06 +00:00
Doug Zongker bfcc4cf4a0 remove unused xdelta3/xz utilities
This was part of the original block-based OTA mechanism.

Bug: 16987495
Change-Id: I953cc206ea1f1fa7360ae0bf4ce721c3e4aacaf3
2014-08-25 08:20:59 -07:00
Doug Zongker ce43bc8df2 include oem.prop files in otatools_package
Change-Id: I2f28936edda5d8d9bff6213828c16d607263cd95
2014-08-25 08:08:26 -07:00
Doug Zongker f22b0f43ef 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: If14b4afefcc1a20ea19dfca3f3b9f9fae73189a6
2014-08-22 09:24:31 -07:00
Ying Wang ebe63fb0a0 Store a copy of installed-files.txt in DIST_DIR if system.img failed to build
Because we already have rule to store installed-files.txt in DIST_DIR,
to avoid the slim chance of race condition, this copy is named as
installed-files-rescued.txt

Change-Id: I9fa6d8aded0ad5de1f1422d70a4224b3fc308e75
2014-08-19 12:21:35 -07:00
Ying Wang 45ff36ee4c Print out the tree size of system directory if it failes to build system.img
The tree size gives a good estimate of how big the system.img would be.

Change-Id: Iaadd58e3521b5f76cd9dfdcf384f4d820b9fc71b
2014-08-13 13:58:03 -07:00
Deepanshu Gupta 88a307eb32 Add list of all fonts shipped
Create a new file that lists all the fonts bundled with the SDK.

Change-Id: I269216ee753b78e0b0ee71c0ece4f6b759c36664
2014-08-12 14:57:52 -07:00
Deepanshu Gupta 7a864ea196 Update font list for the SDK
Java has a problem loading OpenType fonts. This change updates the list
of fonts to include by omitting the otf fonts and adding their
replacement.

This change also moves the code for configuring the fonts for the SDK in
a separate file so that the core Makefile remains cleaner.

Change-Id: Iaf30a3ec59adf251b79cb20f27ad88fc92205ac1
2014-08-11 17:59:24 -07:00
Deepanshu Gupta ec02094d3e Merge "Use fonts from generic device for the SDK." into lmp-dev 2014-08-10 19:43:29 +00:00
Deepanshu Gupta 4e5e582522 Use fonts from generic device for the SDK.
This removes the explicit list of fonts for the SDK and replaces it with
the fonts built for the generic device.

Also, the symlinked fonts are copied becuase Windows doesn't support
symlinks.

Change-Id: I8b18b2ab0149ab24448f27dbd5f9716e5d360029
2014-08-09 00:37:31 +00:00
Colin Cross ef77e517f7 Revert "HACK: report CPU abi as 2nd arch if present"
This reverts commits 8179d4dcf6,
00c67a0568, and
d00c0a2e20.

Bug: 15933961
2014-08-05 11:01:54 -07:00
Doug Zongker 3c84f56948 store images in target-files
Store sparse images in the target-files, and use those (when they're
available) for building block OTAs.

- New script add_img_to_target_files is added to make the images and
  add them to the IMAGES/ subdir in the target-files.  It gets run
  from the Makefile when building a target-files.

- img_from_target_files becomes mostly vestigial: it creates the
  img.zip by just copying the images out of the target-files.  (It
  still knows how to build images for use on older target-files.)

- ota_from_target_files uses images from the target-files in
  preference to rebuilding images from the source files.

- sign_apk_target_files builds images and includes them in its output
  target files (even if the input target-files didn't have them).

Bug: 16488065
Change-Id: I444e0d722d636978209467ffc01750a585c6db75
2014-07-31 11:06:30 -07:00
Daniel Rosenberg 337bbf89d9 Merge "Create a vendor build.prop for verifying versions" into lmp-dev 2014-07-22 16:21:19 +00:00
Daniel Rosenberg 40b61ca768 Create a vendor build.prop for verifying versions
The vendor build.prop contains the fingerprint for the build, and
timestamps. It allows you to tell if the vendor partition matches
the system partition.

Change-Id: Icf261571e82823928b2562e66e48fbcb0da55801
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-07-22 15:00:59 -07:00
Ying Wang 50367cc77d Trim down BUILD_FINGERPRINT.
Bug: 15593959
Change-Id: I90161045b5d5f2df726a4f69740f0875c8bfc69f

Conflicts:
	core/build_id.mk
2014-07-19 09:37:52 -07:00
Ying Wang 2ce3d5c4ae Update rule of APPS_ZIP to use the new paths of apks.
Bug: 16319961
Change-Id: I9fc93f329a34e404beaf3fa212772b731a7020ff
2014-07-18 19:15:15 -07:00
Ying Wang ab4a98a85d Remove unnecessary dependency of the sdk target.
ALL_GENERATED_SOURCES forces to build heavy things already covered by
build cache.

Change-Id: I362bc450b9e303120d12ee8d53d75e86ef71e58f
2014-07-21 16:06:21 -07:00
Ying Wang 3e72ed17a5 Fail build if non-symlink /system/vendor detected while we are building
Fail build if non-symlink /system/vendor detected while we are building
a separate vendor.img.

Bug: 16360411
Change-Id: I96cb6d0b654d6632cd820ba193423e9a16214638
2014-07-17 13:00:20 -07:00
Ying Wang cff386250f Include vendor.img in PDK build.
- Add the stuff in /vendor to platform.zip.
- Pull things of vendor.img from platform.zip when doing PDK fusion
  build.

Bug: 16354024
Change-Id: I4f3fd392af8c357a5614b3e26ceac15fd3e6a0d0
2014-07-16 17:46:35 -07:00
Joe LaPenna 792ab6cd24 Add tvdpi to list of possible recovery asset densities
Bug: 16306251

Change-Id: Iaf2d36d734bb6b639b01e1097723d8387259265b
2014-07-15 16:51:44 -07:00
Daniel Rosenberg f4eabc3961 Added support for building verified vendor partition
Change-Id: I762724800ccab3a365e6d2efdf86cd9c394818eb
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-07-14 22:55:22 +00:00
Geremy Condra 740b6636cc Add support for signed boot images. 2014-07-10 14:53:08 -07:00
Colin Cross d00c0a2e20 HACK: report CPU abi as 2nd arch if present
Workaround to report armv7 abis for arm64 devices until the play store
looks at the new android.os.Build.SUPPORTED_ABIS list.

Bug: 15018047
Change-Id: If5f4081073ee80433aae51ef15ccbfa1c6ae624c
2014-06-27 10:49:26 -07:00
Ying Wang 23898df867 Create symlink /system/vendor if necessary.
Bug: 15728378
Change-Id: I0fe621096bb264882dc1b6face7440298fb56af0
2014-06-18 20:26:24 -07:00
Ying Wang 69c27d9ad9 am 88440c53: am 5d88b3d7: am c4262982: Merge "Use the correct MKBOOTIMG."
* commit '88440c536ba0cfdd42e88378c952eb56f918f4a8':
  Use the correct MKBOOTIMG.
2014-06-18 21:09:30 +00:00
Ying Wang 88440c536b am 5d88b3d7: am c4262982: Merge "Use the correct MKBOOTIMG."
* commit '5d88b3d7d615995c6b1909992347fe0b5692492e':
  Use the correct MKBOOTIMG.
2014-06-18 18:41:01 +00:00
Deepanshu Gupta 849cf47483 am aaa502bc: am e662adf7: am 2a7f1c59: Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev
* commit 'aaa502bc9ee796c4121cc275834f083b85b4e71e':
  Integrate build_font.py [DO NOT MERGE]
2014-06-18 00:25:30 +00:00
Deepanshu Gupta aaa502bc9e am e662adf7: am 2a7f1c59: Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev
* commit 'e662adf748be5d8df6056f4cf5da2c821bc27c59':
  Integrate build_font.py [DO NOT MERGE]
2014-06-18 00:15:39 +00:00
Ying Wang 42c9804331 Use the correct MKBOOTIMG.
Change-Id: I7450a85770cc8de2ea313570999a7d7076e950d2
2014-06-18 11:31:21 -07:00
Deepanshu Gupta 2a7f1c5930 Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev 2014-06-17 20:49:29 +00:00
JP Abgrall 5bfed5a320 core+tools: support specifying F2FS as the fstype for userdata
- Support TARGET_USERIMAGES_USE_F2FS.
- Support BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE.
- Support "userdata_fs_type" in the prop dict.
- Update build_image to recognize f2fs and call the correct command.

Change-Id: If31cc8bd235f93a4c7814fab36e6e2d13d3037ad
Signed-off-by: JP Abgrall <jpa@google.com>
2014-06-17 13:32:14 -07:00
Doug Zongker 3fd79a352e Merge "full support for OTA of vendor partitions" 2014-06-17 03:47:23 +00:00
Doug Zongker c8b4e849f1 full support for OTA of vendor partitions
Make vendor partition a first-class member of the OTA system (for
target_files that contain a VENDOR/ subdirectory).

Build vendor images in a way that is compatible with block-based OTA.
Support updating the vendor partition in both full and incremental,
block and file OTAs.  In most cases this is handled by refactoring the
existing code to handle the system partition to handle either, and
then calling it twice.

Currently we don't support incremental OTAs from a target-files
without a VENDOR subdirectory to one with one, or vice versa.  To add
or remove a vendor partition a full OTA will need to be done.

Bug: 15544685
Change-Id: I9cb9a1267060bd9683a9bea19b43a26b5a43800d
2014-06-16 15:39:54 -07:00
JP Abgrall 0ed7cec97a core: Fixup assert-max-image-size/assert-max-file-size usage
- Remove the incorrectly used (and unused) 3rd arg to assert-max-image-size
- Remove test for fstype in assert-max-file-size() as it was always
  set to a value leading to 0.

Change-Id: I0a1182fcc85c6c3801d45731e691b9bb38657606
Signed-off-by: JP Abgrall <jpa@google.com>
2014-06-16 14:20:40 -07:00
Ying Wang 4d386c8e04 am 13a476c4: am 2f1f30a9: Merge "Trim down BUILD_FINGERPRINT."
* commit '13a476c40c0354220829efe29224845da78b6326':
  Trim down BUILD_FINGERPRINT.
2014-06-16 16:33:45 +00:00
Ying Wang 5181a36bce Trim down BUILD_FINGERPRINT.
Bug: 15593959
Change-Id: I90161045b5d5f2df726a4f69740f0875c8bfc69f
2014-06-13 18:02:44 -07:00
Deepanshu Gupta 354ed641eb Integrate build_font.py [DO NOT MERGE]
Execute the build_font.py script to rename the PS name of the fonts to
be shipped with the SDK.

Also edited the list of font directories to include in the build.

Change-Id: I023fb0dfcf50698f80e26b7d476969c453fc4cc7
(cherry picked from commit 887cd0c71e)
2014-06-12 16:03:17 -07:00
Deepanshu Gupta 04d0f5f3ab am 887cd0c7: Integrate build_font.py again
* commit '887cd0c71e756d295f6879e6b3f34753b9d67ce8':
  Integrate build_font.py again
2014-06-12 16:54:20 +00:00
Ying Wang f7988507f4 am 2d19cbd2: resolved conflicts for merge of 135e11df to klp-modular-dev-plus-aosp
* commit '2d19cbd279ed69c7202f089be174c35c1585f709':
  Switch to 32-bit-by-default host multilib build.
2014-06-11 19:26:30 +00:00
Deepanshu Gupta 887cd0c71e Integrate build_font.py again
Executle the build_font.py script to rename the PS name of the fonts to
be shipped with the SDK.

Change-Id: I023fb0dfcf50698f80e26b7d476969c453fc4cc7
2014-06-10 18:41:29 -07:00
Ying Wang 2d19cbd279 resolved conflicts for merge of 135e11df to klp-modular-dev-plus-aosp
Change-Id: Ib636e501413c0821685d505f62f56d80d145ff7f
2014-06-10 09:45:45 -07:00
Ying Wang 2713fcebba Switch to 32-bit-by-default host multilib build.
Also we don't need to force LLVM built from source, for we already force
LLVM to be built as 32-bit.

Bug: 13751317
Change-Id: Ifadf1988d28b60cb06316de50f5bdc1834f1acc0
2014-06-09 17:48:05 -07:00
Erik Pasternak 30e677081b am e1d76eed: Merge "Revert "Integrate build_font.py"" into lmp-preview-dev
* commit 'e1d76eed322e620213cd4f936a29229a7658c6a1':
  Revert "Integrate build_font.py"
2014-06-09 15:55:48 +00:00
Deepanshu Gupta 12d786b56d am 8723f9e2: Merge "Integrate build_font.py" into lmp-preview-dev
* commit '8723f9e2127204e19b00b0c19d091bee7e3e1b0c':
  Integrate build_font.py
2014-06-09 15:55:29 +00:00