Commit graph

658 commits

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