Commit graph

561 commits

Author SHA1 Message Date
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
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
Geremy Condra
5dee206d8e Add verity support to make dist.
Without this, system images will be built that do not contain the
necessary bits for verification.

Change-Id: Icaa636085dbfd386424c90dfbe404c5960df0fe4
2014-05-06 18:06:18 -07:00
Colin Cross
e8eef02cca Merge "verity: switch to C++ version of build_verity_tree" 2014-05-02 23:52:16 +00:00
Michael Runge
6e836116f7 Add support for verifying OEM properties.
A separate OEM file must be specified to provide the expected
values for these properties.  The list of properties comes from
the "oem_fingerprint_properties" list in misc_info.txt

Bug: b/13367676

Change-Id: I1a3eaf108492132cf6f595a5d1c9f7e0c3cb3142
2014-05-01 17:37:57 -07:00
Bill Yi
1e4adfa837 Merge commit '8113e43601aac7702b9ec007e81a179826143d1e' into HEAD 2014-04-29 11:32:53 -07:00
Colin Cross
477cf2b029 verity: switch to C++ version of build_verity_tree
The C++ version avoids the need to unsparse the image to generate
the verity image, and is much faster for images with large regions
of don't care (treated as zeroes).

Change-Id: I8396b08a5fdb93f27d8c71c9c1ac23cb75cf1f7f
2014-04-28 17:19:13 -07:00
Colin Cross
8a30f72c0c verity: clean up verity build dependencies
Move image dependencies out of PRODUCT_PACKAGES and into direct
dependencies for the image building rules.

Fix the test for PRODUCT_SUPPORTS_VERITY, it needs to check for
the current project as the global is no longer set.

Change-Id: I811501834ae5ec658229bd505fcc48275ff578c9
2014-04-28 17:19:04 -07:00
Ying Wang
b8888432f0 Set up rules to build oem.img
To build oem.img:
- You must define BOARD_OEMIMAGE_PARTITION_SIZE in your BoardConfig.mk
- The file system type will be the same as system.img and userdata.img.
- To install a module to oem.img, use "LOCAL_OEM_MODULE := true"
- run "make -j48 showcommands oem_image dist". By default it's not
  built.

Bug: 13367676
Change-Id: I1a26d4d0c61b72ecffe60279667b1b3de050780d
2014-04-28 09:43:51 -07:00
Dianne Hackborn
6ee3c4327d Add new facility to have multiple active codenames.
Use this to have both L and KKWT.

Change-Id: I78cd5ed2dcffab9e93030184ba6f9eb9a6a3cba5
2014-04-24 16:19:14 -07:00