Commit graph

2152 commits

Author SHA1 Message Date
Doug Zongker
0faa55a0bf am 994a8db5: am c7933482: am c0f10644: Merge "make SignApk do zip alignment"
* commit '994a8db5a990676f1b08dab2ee980a9fc8d63685':
  make SignApk do zip alignment
2014-05-16 17:40:54 +00:00
Doug Zongker
994a8db5a9 am c7933482: am c0f10644: Merge "make SignApk do zip alignment"
* commit 'c79334829885a82f600779d39b5577b921c64f67':
  make SignApk do zip alignment
2014-05-16 16:03:59 +00:00
Doug Zongker
c793348298 am c0f10644: Merge "make SignApk do zip alignment"
* commit 'c0f10644bf877fae44e8aa5ebfff41f0e27af197':
  make SignApk do zip alignment
2014-05-16 15:59:51 +00:00
Doug Zongker
1d67eec191 make SignApk do zip alignment
When signing an APK, make the SignApk tool align the stored entries to
(by default) 4-byte boundaries.  This obviates the need to run the
separate zipalign tool, which currently does this job.

The alignment byte count can be specified with the -a option.  OTA
package signing (with -w) never does alignment.

The order of files in the output APK is changed so that all stored
files come first in the output, followed by all non-stored files.
This is not expected to have any impact in practice.

Change-Id: Iaeef89b2a7283e25fadb99c0a0f0641f682d76b8
2014-05-15 09:54:26 -07:00
Ying Wang
8200231ae1 am e50f2d9f: am 40b49d30: am a74ade94: Merge "Support host multilib build"
* commit 'e50f2d9f32a27d8290692dbf99ab8b247ef9d553':
  Support host multilib build
2014-05-15 01:09:49 +00:00
Ying Wang
e50f2d9f32 am 40b49d30: am a74ade94: Merge "Support host multilib build"
* commit '40b49d3043bd41ca5548b99b537038187fdca258':
  Support host multilib build
2014-05-15 00:44:53 +00:00
Ying Wang
40b49d3043 am a74ade94: Merge "Support host multilib build"
* commit 'a74ade945776e80f99f3b05d06a131cfd353c3f6':
  Support host multilib build
2014-05-15 00:41:37 +00:00
Ying Wang
6feb6d5607 Support host multilib build
This change basically ported our target multilib to the host side.
It supports 2 host build modes: x86 and x86_64 multilib build.
For now you need to set "BUILD_HOST_64bit=true" to switch to x86_64
multilib build. Later we'll default to x86_64 build and have a flag
to force 32-bit only build, which may be needed by SDK build.

In host module definition, like in target ones, you can use the
following
LOCAL variables to set up multilib configuration:
LOCAL_MULTILIB: can be "both", "first", "32" or "64".
It also supports the same set of arch or 32-vs-64 specific LOCAL
variables.
By default, it builds only for the first arch.

To keep path compatibility, in x86_64 build files are still output to
out/host/linux-x86; Both 32-bit and 64-bit executables are in
out/host/linux-86/bin;
In x86_64 build 32-bit shared libraries are installed to
out/host/linux-x86/lib32
and 64-bit shared libraries are installed to out/host/linux-x86/lib;
32-bit object files are output to out/host/linux-x86/obj32 and 64-bit
object files
are output to out/host/linux-x86/obj.

Bug: 13751317
Change-Id: I6044f83b7db369a33e05209e8c588eb6dc83409f
2014-05-14 16:55:04 -07:00
Dirk Dougherty
5772ce6130 Sync master templates with upstream branch, retain annotation customization from master.
Change-Id: Ie1119bc1b18a017e1bef199949801fb045d8ff06
2014-05-14 15:04:40 -07:00
Dirk Dougherty
efb9987de6 am 8fdd4a0b: am 7db3e8a5: am 9890fe24: am c3921656: Add templates support for dynamic content and sticky nav bar.
* commit '8fdd4a0b567878c5cf0aaa9f24496f5888239fea':
  Add templates support for dynamic content and sticky nav bar.
2014-05-14 21:09:39 +00:00
Dirk Dougherty
8fdd4a0b56 am 7db3e8a5: am 9890fe24: am c3921656: Add templates support for dynamic content and sticky nav bar.
* commit '7db3e8a518ee51ba1a511948de71675e3457ff13':
  Add templates support for dynamic content and sticky nav bar.
2014-05-14 21:02:39 +00:00
Dirk Dougherty
7db3e8a518 am 9890fe24: am c3921656: Add templates support for dynamic content and sticky nav bar.
* commit '9890fe24f1451d0393337904852d0ca24808c2bc':
  Add templates support for dynamic content and sticky nav bar.
2014-05-14 20:56:51 +00:00
Dirk Dougherty
c3921656f5 Add templates support for dynamic content and sticky nav bar.
Change-Id: Icb4e492a991a19e3e1eac72eafc83623b00be5de
2014-05-14 12:00:34 -07:00
Geremy Condra
15d5348e6c Reopen temporary system image to avoid stale data.
NamedTemporaryFile's aggressive caching behavior can cause an issue
where changes made by another process aren't visible even after the
fseek() below or a flush(). To avoid this, simply open the file
again and read from the fresh version.

This fixes an issue where verity metadata written by append2simg
doesn't become visible to img_from_target_files.

Change-Id: I291fb3a95d5b532218ac6205ecc9e9b4f3a36bd4
2014-05-13 20:23:54 -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
Scott Main
bd58064a62 am 17b3567b: am e4af3b35: am 18ba007b: am 7a6ab434: update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav
* commit '17b3567b064fa8d8637113c49014494e25241aa6':
  update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav link, the header logo is used for the breadcrumb's first link and text.
2014-05-10 00:23:05 +00:00
Scott Main
17b3567b06 am e4af3b35: am 18ba007b: am 7a6ab434: update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav link, the he
* commit 'e4af3b35588932d9f14eacaee783bb6fcff0d72b':
  update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav link, the header logo is used for the breadcrumb's first link and text.
2014-05-10 00:18:17 +00:00
Scott Main
e4af3b3558 am 18ba007b: am 7a6ab434: update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav link, the header logo is
* commit '18ba007b371478254faa43f563ee28295e7d742d':
  update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav link, the header logo is used for the breadcrumb's first link and text.
2014-05-10 00:13:27 +00:00
Michael Runge
4f12fceead Add missing quotation mark in assertion
Change-Id: I3e76997fe257bfccb7d61dcc1273e014cdb55a41
2014-05-09 14:14:42 -07:00
Doug Zongker
91a99c28e0 fix ota script to generate non-block commands correctly
If you had a target_files without a recovery patch and specified
--block (which should have no effect without a patch), it would have
omitted some necessary commands from the OTA script.

Change-Id: I96e79cd561ebf09cfe53792d1cc558cc71479869
2014-05-09 13:16:50 -07:00
Scott Main
7a6ab434bc update wear header template to support sticky nav.
moved the search and menu markup for the header into a method call.
also update the styles and script so that when a page does not belong
to a primary horizontal-nav link, the header logo is used for the breadcrumb's
first link and text.

Change-Id: I14129fe7657924e2037c103674e09322c4c31db8
2014-05-09 12:16:14 -07:00
Doug Zongker
af845256f1 assert recovery finger/thumbprints, not system
Block OTAs don't have the system partition mounted and so can't use
file_getprop on the system partition.  Make assertions look at the
recovery system finger/thumbprints, which should be the same as the
ones on the system partition (even for sprout devices).

Change-Id: Ie5d329d13beab4b428e37f75da9b9e1b8ceb35bc
2014-05-09 08:29:05 -07: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
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
Michael Runge
0a2ce08f66 Merge "Support block OTA + OEM partition" 2014-05-05 19:57:56 +00:00
Michael Runge
c6e3afd26d Support block OTA + OEM partition
Change-Id: I9e662098569a43b05279908e6833e9552a7abe3a
2014-05-05 12:22:12 -07:00
Colin Cross
e8eef02cca Merge "verity: switch to C++ version of build_verity_tree" 2014-05-02 23:52:16 +00:00
Dirk Dougherty
03257fe50c am d19aa4ba: am 611d7e14: am 379d9968: am e21bed28: Merge changes from templates-sdk to templates-sdk-dyn.
* commit 'd19aa4bae2161f89966e38cb099f2f080e2bbfac':
  Merge changes from templates-sdk to templates-sdk-dyn.
2014-05-02 23:03:45 +00:00
Dirk Dougherty
d19aa4bae2 am 611d7e14: am 379d9968: am e21bed28: Merge changes from templates-sdk to templates-sdk-dyn.
* commit '611d7e14e87d030cd5d89b932a1877289ab68e8d':
  Merge changes from templates-sdk to templates-sdk-dyn.
2014-05-02 22:58:02 +00:00
Dirk Dougherty
611d7e14e8 am 379d9968: am e21bed28: Merge changes from templates-sdk to templates-sdk-dyn.
* commit '379d9968ccc31701053eca7e0d809f2f52c0b964':
  Merge changes from templates-sdk to templates-sdk-dyn.
2014-05-02 22:54:45 +00:00
Dirk Dougherty
e21bed28ac Merge changes from templates-sdk to templates-sdk-dyn.
Change-Id: I42e42f8d412eae6fc1160594c235cda81b2baf4f
2014-05-02 15:44:20 -07: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
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
Ying Wang
c73e461537 Fix variable name.
Change-Id: Ie7439f71cf7fd2eeacd45a5d6625e610dad8bfbe
(cherry picked from commit 1a1dfcb5fcb6eda11d8dbf5df02f0083853dd5c1)
2014-04-15 22:31:54 +00:00
Scott Main
e65e213444 am 554bb7b6: am cdbb1241: am 01adbdcb: am 613b251b: Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs
* commit '554bb7b61081e80d79bf29a3690ba6fff391df55':
  remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag.
2014-04-15 20:52:27 +00:00
Ying Wang
114b46f15d Accomodate to the import syntax in build.prop.
Bug: 14024566
Change-Id: I71692244fabcd4d12f65849ffa027295b3a2a79a
(cherry picked from commit 092fea0d3e644573d7f0dbfe6692f42431f83c5c)
2014-04-15 20:28:53 +00:00
Ying Wang
5a7ad0338b Accomodate to the import syntax in build.prop.
Bug: 14024566
Change-Id: I70b8d3c8cfc968a7f039728375f3f7f341cdc11a
2014-04-15 12:37:13 -07:00
Scott Main
554bb7b610 am cdbb1241: am 01adbdcb: am 613b251b: Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs
* commit 'cdbb12418943889a86576b24ae91ddd6a2b5340e':
  remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag.
2014-04-15 02:46:17 +00:00
Scott Main
cdbb124189 am 01adbdcb: am 613b251b: Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs
* commit '01adbdcb954e2d694ec40ac149f07c44defcc796':
  remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag.
2014-04-15 02:44:48 +00:00
Scott Main
613b251b7b Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs 2014-04-15 02:38:35 +00:00
Scott Main
4868e9bf92 remove the animated scroll adjustment for sticky nav.
Instead adjust the scroll position based on changes to the hashtag.

Change-Id: I34a6b386fa2104f8f2ac04e1d9820199f0ef0e94
2014-04-14 19:00:12 -07:00
Scott Main
74e22573a6 am 78f264f7: am 3829f621: am b1a6d644: am 1670cca5: Merge "make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results." into klp-docs
* commit '78f264f79be427d4bbe6446c1e4893b1526e76d7':
  make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results.
2014-04-14 15:49:36 +00:00
Dirk Dougherty
7b1fe64cfd am 7de9c942: am 45094b5d: am d0c6f0a1: am 318fb971: Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
* commit '7de9c94263c48c00b52a9d2feccd51b477aacac1':
  Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
2014-04-14 15:49:19 +00:00
Scott Main
78f264f79b am 3829f621: am b1a6d644: am 1670cca5: Merge "make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results." into klp-docs
* commit '3829f62188161fe7528e18de7bb226896611fee0':
  make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results.
2014-04-14 15:01:48 +00:00
Scott Main
3829f62188 am b1a6d644: am 1670cca5: Merge "make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results." into klp-docs
* commit 'b1a6d6441a02478569e57a5da5b9655dd1409efa':
  make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results.
2014-04-14 14:58:17 +00:00
Scott Main
1670cca5f9 Merge "make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results." into klp-docs 2014-04-14 14:52:32 +00:00