Commit Graph

769 Commits

Author SHA1 Message Date
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 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
Erik Pasternak e1d76eed32 Merge "Revert "Integrate build_font.py"" into lmp-preview-dev 2014-06-08 20:12:41 +00:00
Erik Pasternak 21cf439581 Revert "Integrate build_font.py"
This CL broke the SDK builds.

This reverts commit 9eebd78f6e.

Change-Id: I973b40688602461bd3b0f8c1e1beb53b9fbec83c
2014-06-08 19:31:01 +00:00
Deepanshu Gupta 8723f9e212 Merge "Integrate build_font.py" into lmp-preview-dev 2014-06-07 23:33:12 +00:00
Ying Wang e8dc18680f am dc7ff054: am bc080d51: am 2a386e0c: Allow to build the update.zip for emulator build.
* commit 'dc7ff05427e885a59e8884e0f8e10a6c78f2842b':
  Allow to build the update.zip for emulator build.
2014-06-04 17:30:32 +00:00
Ying Wang dc7ff05427 am bc080d51: am 2a386e0c: Allow to build the update.zip for emulator build.
* commit 'bc080d510f022da8055b89b85e02d91e74c3757d':
  Allow to build the update.zip for emulator build.
2014-06-04 17:26:00 +00:00
Ying Wang 2a386e0cfb Allow to build the update.zip for emulator build.
img_from_target_files.py just skips the boot.img and recovery.img since
there is no kernel or recovery.fstab for emulator.

Bug: 15383279
Change-Id: I4035193e6ab933194ff1417dfae4eab963fe5301
2014-06-04 17:04:14 +00:00
Ying Wang f8824aff68 Allow to build the update.zip for emulator build.
img_from_target_files.py just skipps the boot.img and recovery.img since
there is no kernel or recovery.fstab for emulator.

Bug: 15383279
Change-Id: I4035193e6ab933194ff1417dfae4eab963fe5301
2014-06-03 14:07:27 -07:00
Ying Wang e3e421f851 Move sdk staging dir to a product-specific dir
So we can do incremental build across different SDK products.

(cherry picked from commit d7af176199)

Change-Id: I30ebed5328123629519a64c793f94fc8d5aa09a8
2014-06-02 18:32:54 -07:00
Ying Wang 9c777b3718 am dfafee3b: am 7f349dc9: am 40b7e342: Merge "Move sdk staging dir to a product-specific dir"
* commit 'dfafee3b782cc48562126b9c4748cfa2f49f3158':
  Move sdk staging dir to a product-specific dir
2014-06-03 01:27:55 +00:00
Ying Wang dfafee3b78 am 7f349dc9: am 40b7e342: Merge "Move sdk staging dir to a product-specific dir"
* commit '7f349dc968a3fc76f48e1e199f1036b40e582851':
  Move sdk staging dir to a product-specific dir
2014-06-03 01:25:23 +00:00
Ying Wang 7f349dc968 am 40b7e342: Merge "Move sdk staging dir to a product-specific dir"
* commit '40b7e34240be756bbf1542b63eef6332024d067e':
  Move sdk staging dir to a product-specific dir
2014-06-03 01:22:51 +00:00
Ying Wang d7af176199 Move sdk staging dir to a product-specific dir
So we can do incremental build across different SDK products.

Change-Id: If3f082e4b92d00e7ccda980610e1d967d44da622
2014-06-02 16:16:53 -07:00
Nick Kralevich bf9f0712f2 am 46c48a0c: am 1df5b37b: am 61cf065a: Merge "Use a separate policy for the recovery image."
* commit '46c48a0c34dfafde4cd55956ffbb9251a1cdac02':
  Use a separate policy for the recovery image.
2014-05-30 19:01:37 +00:00
Nick Kralevich 46c48a0c34 am 1df5b37b: am 61cf065a: Merge "Use a separate policy for the recovery image."
* commit '1df5b37b5b73324300ae1b5f255c1a772c65328a':
  Use a separate policy for the recovery image.
2014-05-30 18:27:03 +00:00
Nick Kralevich 1df5b37b5b am 61cf065a: Merge "Use a separate policy for the recovery image."
* commit '61cf065ae9247a200208dc7df0234e03caff3605':
  Use a separate policy for the recovery image.
2014-05-30 18:23:41 +00:00
Deepanshu Gupta 9eebd78f6e Integrate build_font.py
Executle the build_font.py script to rename the PS name of the fonts to
be shipped with the SDK.

Change-Id: I14f8a27b9da8d4aa7b9d2773cf4aa84c6f3c22fe
2014-05-30 10:29:34 -07:00
Stephen Smalley 5520f28653 Use a separate policy for the recovery image.
Only the recovery image needs to include the recovery domain
in its policy, so create a separate policy for the recovery image
and replace the root policy with this one when building the
recovery image.

Depends on the change with the same Change-Id in external/sepolicy.

Change-Id: I444107f9821eabf4164ba07a44d03bd71e719989
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-05-29 16:42:49 -04:00
Yuncheol Heo 623d706253 Fix the path for findbugs.
Change-Id: I45485f1aeaf7fc3db2839f42829278d8c0ec97e3
2014-05-20 17:13:34 +09:00
Doug Zongker 9843fd8489 add missing verity tools to otatools target
Change-Id: I856e43ac9757cf082548646e50db8bbc8da71d0a
2014-05-13 14:18:47 -07:00
Doug Zongker 8eaeea95d5 improve density selection of recovery assets
Some recovery UI assets are available in different sizes; we need to
pick the right ones for the device's density.  Use
PRODUCT_AAPT_PREF_CONFIG if it is available (it is empty for older
devices), and fall back to the highest density in PRODUCT_AAPT_CONFIG
if the PREF_ version is not available.

Change-Id: Ia1eb7d5409cda17b0fc5c0bcfc33dfa6a50893e8
2014-05-12 15:38:57 -07:00
Geremy Condra c10320eef3 Merge "Add verity support to `make dist`." 2014-05-12 17:00:58 +00:00
Geremy Condra 5b5f4958d8 Add verity support to `make dist`.
Without this, system images will be built that do not contain the
necessary bits for verification.

Change-Id: I87c15282b26377d7a2a1540e3d0e30b0299622e3
2014-05-10 18:31:07 -07:00
Ed Heyl 0cd5ec5b16 Merge "Fix build: Revert "Add verity support to `make dist`."" 2014-05-09 05:58:28 +00:00
Ed Heyl 3e92fd0fba Fix build: Revert "Add verity support to `make dist`."
This reverts commit 5dee206d8e.

Change-Id: I6f4f536c127d3e5dcb6594efb193231cd8dece7e
2014-05-09 05:53:54 +00:00
Xavier Ducrohet 7b967dc13f am a6a2969e: Resolved conflicts for merge of 05a7a955 to klp-modular-dev-plus-aosp
* commit 'a6a2969e020ea16edbe24661d2b63f7f2bdf98b6':
  Remove SDK Tools from platform builds.
2014-05-09 02:13:32 +00:00
Xavier Ducrohet a6a2969e02 Resolved conflicts for merge of 05a7a955 to klp-modular-dev-plus-aosp
Change-Id: Ife0d1ef3d5a0cb4b91c8b813d259c947c85018f8
2014-05-08 18:48:26 -07:00
Geremy Condra c921b1eb19 Merge "Add verity support to `make dist`." 2014-05-09 01:39:44 +00:00
Xavier Ducrohet 05a7a955c1 am afe444a5: Merge "Remove SDK Tools from platform builds."
* commit 'afe444a564ed72cdda792822a0c9dab57a8c9172':
  Remove SDK Tools from platform builds.
2014-05-09 00:52:34 +00:00
Xavier Ducrohet afe444a564 Merge "Remove SDK Tools from platform builds." 2014-05-09 00:46:45 +00:00
Ying Wang af3f1a5454 am d6214b31: am 0d4b3df6: Merge "Target "tests" now only builds the modules tagged as "tests""
* commit 'd6214b3161161faf63a60b3ad3f595569a481192':
  Target "tests" now only builds the modules tagged as "tests"
2014-05-09 00:10:43 +00:00
Ying Wang d6214b3161 am 0d4b3df6: Merge "Target "tests" now only builds the modules tagged as "tests""
* commit '0d4b3df6aa495ab2aaabe3a8d5c9c6ad69ab5667':
  Target "tests" now only builds the modules tagged as "tests"
2014-05-09 00:06:36 +00:00
Ying Wang 07b2055d3e Target "tests" now only builds the modules tagged as "tests"
But not install them.
This prevents "make tests" polluting system.img or userdata.img.
We have new mechanism to build and package up modules into zip file in
build/core/tasks/tools.
Change package-modules.mk to install DATA/ instead of data/ in the
zip file; Better handle of module name conflicting.

Bug: 13585955
Change-Id: I7586a8c7995b984c9ead0ba2fa84dd5d2dd20bd1
2014-05-08 17:01:25 -07:00
Ying Wang 571fee8985 Target "tests" now only builds the modules tagged as "tests"
But not install them.
This prevents "make tests" polluting system.img or userdata.img.
We have new mechanism to build and package up modules into zip file in
build/core/tasks/tools.
Change package-modules.mk to install DATA/ instead of data/ in the
zip file; Better handle of module name conflicting.

Bug: 13585955
Change-Id: I7586a8c7995b984c9ead0ba2fa84dd5d2dd20bd1
2014-05-08 14:52:39 -07:00
Xavier Ducrohet 51e303a281 Remove SDK Tools from platform builds.
(cherry picked from commit edf30221b4890673dc714a1efef3b5faf4ae1522)

Change-Id: Ia74c2ece1528adca10a4eec24e73b4ce361af1a9
2014-05-08 14:50:15 -07:00