Commit Graph

752 Commits

Author SHA1 Message Date
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