Commit Graph

610 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 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 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
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 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
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 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 bfbd41edcb Missed one part of removing the vbox target.
Change-Id: I8edb5252b5e71de042b79cb9eb2a497d89efb773
2014-09-10 15:58:20 -07:00
Doug Zongker 8544877399 select default search_path by platform
Bug: 17443175
Change-Id: I2b8b0a3b56e667b749ac167a6d09dc973ecf8419
2014-09-09 15:11:13 -07: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
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