Commit Graph

4255 Commits

Author SHA1 Message Date
Alex Deymo
2bcab53917 Merge "Include Brillo\'s cannonical .clang-format file."
am: 1bd78f399f

* commit '1bd78f399fdd3a358e7e64aae45a55b667d5cd8f':
  Include Brillo's cannonical .clang-format file.
2016-02-16 23:22:37 +00:00
Alex Deymo
1bd78f399f Merge "Include Brillo's cannonical .clang-format file." 2016-02-16 22:32:06 +00:00
Alex Deymo
665110e38c Include Brillo's cannonical .clang-format file.
Many Brillo repositories need to share a common .clang-format file to
ensure the same formatting rules. This patch moves the .clang-format
file already in system/core/metricsd to a common location to be shared
by other Brillo repositories.

Bug: 27121653
TEST=symlink from system/update_engine, ran clang-format.

Change-Id: Ie04a5a9cf54b9cc24f180fe3896501db4d883a64
2016-02-16 14:29:45 -08:00
Colin Cross
1bfbdbf4df Merge "makeparallel: unset MAKEFLAGS and MAKELEVEL"
am: 03f0a03857

* commit '03f0a038578ca86e93408bdc7c00e5ac8f1a3578':
  makeparallel: unset MAKEFLAGS and MAKELEVEL
2016-02-16 21:20:55 +00:00
Colin Cross
d2f35846e4 makeparallel: unset MAKEFLAGS and MAKELEVEL
makeparallel inherits values for MAKEFLAGS and MAKELEVEL from make
through the environment, but they should not be propagated to the child
process in case the child process tries to run make again.

Bug: 26071246
Change-Id: I4c5df10ea8055cd1f1f61a892d5b1a7acb287bbb
(cherry picked from commit d8f0d68b78)
2016-02-16 13:10:40 -08:00
Colin Cross
03f0a03857 Merge "makeparallel: unset MAKEFLAGS and MAKELEVEL" 2016-02-16 21:08:59 +00:00
Alex Klyubin
97dd58a071 Switch to production constant for v2 signing scheme ID.
Bug: 25794543
Change-Id: I0e06f31ea3117c6865d18f853f99304964b323b4
2016-02-16 12:42:37 -08:00
Aurimas Liutikas
3dcc13602e Fix 2 unused parameter warnings in zipalign.
am: af1d741182

* commit 'af1d7411825e589f09074c04bbbd80497b60e9e9':
  Fix 2 unused parameter warnings in zipalign.
2016-02-12 18:02:05 +00:00
Aurimas Liutikas
af1d741182 Fix 2 unused parameter warnings in zipalign.
ZipFile parameter was not used and therefore can be removed.

Bug: 26936282
Change-Id: Id2b6e693b40571b7e7486304a6effaedc1b3c940
2016-02-12 02:13:30 +00:00
Dan Willemsen
e71eae1ffa Merge "fs_config: error on multiple specifications of android_filesystem_config.h"
am: 0f745aaf4d

* commit '0f745aaf4dded51a6b5265ab94ba3361ced75554':
  fs_config: error on multiple specifications of android_filesystem_config.h
2016-02-11 21:26:04 +00:00
William Roberts
78626c480a fs_config: error on multiple specifications of android_filesystem_config.h
Multiple files added to TARGET_ANDROID_FILESYSTEM_CONFIG_H will build,
however the tooling will only respect the first header found. The
sanity check in the makefile will only check the first path found for
proper naming convention. One can end up with a successful build that
does not respect all files in the TARGET_ANDROID_FILESYSTEM_CONFIG_H.

Check that one and only one item is set to
TARGET_ANDROID_FILESYSTEM_CONFIG_H variable.

Output:
*** Multiple fs_config files specified, see "device/lge/bullhead/two/android_filesystem_config.h device/lge/bullhead/one/android_filesystem_config.h"..

Change-Id: I70a43f44713b273cb9a78f54ff16854b9e11af4a
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-02-11 10:47:06 -08:00
Alex Klyubin
b05b62df2e Sign APKs using SHA-256 instead of SHA-1 when possible.
This changes the build system to provide the signapk tool with the
minSdkVersion of the APK being signed. signapk in turn will then use
SHA-256 instead of SHA-1 if minSdkVersion is 18 (JB MR2) or higher
(see c2c49ed0c1).

To avoid increasing incremental OTA update package sizes for already
released platforms, release build scripts disable the above logic when
signing target files ZIPs for pre-N platforms.

Bug: 25643280

(cherry picked from commit 2cfd1d108c)

Change-Id: I38450d07ddc05c705de40313f843beada8db7d98
2016-02-10 17:19:08 -08:00
Alex Klyubin
fec3a14892 Merge "Sign APKs using SHA-256 instead of SHA-1 when possible."
am: 07d3dbd2ed

* commit '07d3dbd2eda1aa5b3283191e681d48b341c635bf':
  Sign APKs using SHA-256 instead of SHA-1 when possible.
2016-02-10 21:46:53 +00:00
Alex Klyubin
07d3dbd2ed Merge "Sign APKs using SHA-256 instead of SHA-1 when possible." 2016-02-10 21:35:06 +00:00
Sami Tolvanen
0975d70e33 Fix metadata location when file system doesn\'t span the partition
am: 405e71dcd3

* commit '405e71dcd3e96457766c3ac3f2aa3d4bd9f95e32':
  Fix metadata location when file system doesn't span the partition
2016-02-10 19:33:05 +00:00
Sami Tolvanen
405e71dcd3 Fix metadata location when file system doesn't span the partition
Pad the sparse image with a zero fill chunk to correctly position
verity and FEC metadata at the end of the partition.

Bug: 27073791
Change-Id: I9f70d579a42e5007d50e9c02a98a608d2815f0ed
(cherry picked from commit 6a8781a251)
2016-02-10 10:53:47 -08:00
Sami Tolvanen
7855c9aadf Merge "Fix metadata location when file system doesn't span the partition" 2016-02-10 18:50:17 +00:00
Alex Klyubin
fb5ac541a4 Merge "Use Jan 1 2009 as timestamp in OTA update ZIPs." into nyc-dev 2016-02-10 18:15:26 +00:00
Alex Klyubin
2cfd1d108c Sign APKs using SHA-256 instead of SHA-1 when possible.
This changes the build system to provide the signapk tool with the
minSdkVersion of the APK being signed. signapk in turn will then use
SHA-256 instead of SHA-1 if minSdkVersion is 18 (JB MR2) or higher
(see c2c49ed0c1).

To avoid increasing incremental OTA update package sizes for already
released platforms, release build scripts disable the above logic when
signing target files ZIPs for pre-N platforms.

Bug: 25643280

Change-Id: I3f2faaf49c6fa392ffbf1ee9f30de476f9f73231
2016-02-10 09:40:31 -08:00
Sami Tolvanen
6a8781a251 Fix metadata location when file system doesn't span the partition
Pad the sparse image with a zero fill chunk to correctly position
verity and FEC metadata at the end of the partition.

Bug: 27073791
Change-Id: I9f70d579a42e5007d50e9c02a98a608d2815f0ed
2016-02-10 09:37:59 -08:00
Tao Bao
b4cfca530c releasetools: Add two new entries to metadata.
Add "ota-required-cache" into the metadata file in an OTA package,
which shows the minimum free space on /cache to apply the update.

Add "ota-type" into the metadata file, which shows the OTA type for
this package (i.e. one of FILE, BLOCK and AB).

Also add the cache free space check into updater-script when generating
block-based incremental OTAs (we only had such lines for file-based
incrementals before).

Bug: 26731903
Change-Id: Id6ff0fc4cdfb1443636b0b3800b0f8bddb5bb1d0
(cherry picked from commit d8d14bec0d)
2016-02-10 09:37:40 -08:00
Tao Bao
ebadc3bd8e Merge "improve performance of blockimgdiff" into nyc-dev 2016-02-10 17:36:59 +00:00
Doug Zongker
6ab2a5017e improve performance of blockimgdiff
Substantially improves the performance of some BlockImageDiff steps on
large images.  GenerateDigraph and AssertSequenceGood are now linear in
the number of blocks in the target image rather than quadratic in the
size of the partition.  FindVertexSequence tracks the score of each
vertex, the set of sources and sinks, and maintains a heap for finding
the best vertex to use for the greedy step, instead of repeatedly
re-scanning the set of remaining vertexes.

Change-Id: Ifeea5053d80ef4f06a5aa239c9a1797dd5e47841
(cherry picked from commit 2d2dd1526d)
2016-02-10 09:36:22 -08:00
Tao Bao
214773499c Merge "releasetools: Add two new entries to metadata."
am: 8290ba9e0d

* commit '8290ba9e0df3e6f4ef8c21e3964862f90944ead2':
  releasetools: Add two new entries to metadata.
2016-02-10 17:10:51 +00:00
Tao Bao
8290ba9e0d Merge "releasetools: Add two new entries to metadata." 2016-02-10 17:05:47 +00:00
Alex Klyubin
b9f720a18b Use Jan 1 2009 as timestamp in OTA update ZIPs.
This is a follow-up to 6c41036bcf where
I forgot to update a section of OTA update ZIP code.

Bug: 26864066

(cherry picked from commit f735851fa9)

Change-Id: I4f85ce170ac72d13a9c8636414927a295e350458
2016-02-10 09:04:49 -08:00
Doug Zongker
52970f60e0 Merge "improve performance of blockimgdiff"
am: ae91d54e89

* commit 'ae91d54e899768d0a185b2fead0e42627b30376d':
  improve performance of blockimgdiff
2016-02-10 16:57:12 +00:00
Doug Zongker
ae91d54e89 Merge "improve performance of blockimgdiff" 2016-02-10 16:52:10 +00:00
Doug Zongker
2d2dd1526d improve performance of blockimgdiff
Substantially improves the performance of some BlockImageDiff steps on
large images.  GenerateDigraph and AssertSequenceGood are now linear in
the number of blocks in the target image rather than quadratic in the
size of the partition.  FindVertexSequence tracks the score of each
vertex, the set of sources and sinks, and maintains a heap for finding
the best vertex to use for the greedy step, instead of repeatedly
re-scanning the set of remaining vertexes.

Change-Id: Ifeea5053d80ef4f06a5aa239c9a1797dd5e47841
2016-02-10 07:44:21 -08:00
Alex Klyubin
831e213b05 Merge "Use Jan 1 2009 as timestamp in OTA update ZIPs."
am: f8a36a90c8

* commit 'f8a36a90c8187ce56aff84224bdeded6cc4158be':
  Use Jan 1 2009 as timestamp in OTA update ZIPs.
2016-02-10 04:49:12 +00:00
Patrick Tjin
2ef3ca59be Add compressor options for squashfs vendor images
am: e11aa50bb2

* commit 'e11aa50bb21e7b7afa17f19085cc20b23683cc18':
  Add compressor options for squashfs vendor images
2016-02-10 00:17:13 +00:00
Patrick Tjin
e11aa50bb2 Add compressor options for squashfs vendor images
Change-Id: I4f9f5d62e24654cb37d436cb73dd5893aed30fa8
2016-02-09 15:41:07 -08:00
smain@google.com
1c2d8c41ba move the parameter_list() method to macros_overrides
Change-Id: Ia8dcbc0cac478a9f89d90ec04a924c579bca3abb
2016-02-09 15:18:30 -08:00
smain@google.com
a0a6d3220f Revise API reference templates to make them compatible
with both DAC and DevSite. Includes a variety of cleanup and redesign.
Now prints method parameters and return values even if not documented in source.
Now prints return value data type.
Now prints method name as heading without arguments, then the full signature below.
New heading styles with more spacing and removed background color.

Change-Id: I7a991df5e8d0d7ac8ff81c20b4b4692e67eb88aa
2016-02-09 15:02:51 -08:00
Alex Klyubin
f735851fa9 Use Jan 1 2009 as timestamp in OTA update ZIPs.
This is a follow-up to 6c41036bcf where
I forgot to update a section of OTA update ZIP code.

Bug: 26864066
Change-Id: Idbcde71d6377a16807e41c999120eeddd5b4d8a4
2016-02-09 13:09:57 -08:00
Dan Willemsen
1447c7cb28 Merge "Revert "Do not diff .odex files""
am: a465cf681b

* commit 'a465cf681bb5fbc0b5a038302e982aa933a0a8ac':
  Revert "Do not diff .odex files"
2016-02-08 22:46:55 +00:00
Dan Willemsen
a465cf681b Merge "Revert "Do not diff .odex files"" 2016-02-08 22:40:33 +00:00
Dan Willemsen
86c8ebb6ef Revert "Do not diff .odex files"
The bug has been fixed, .odex files are deterministic.

This reverts commit c4438d3d29.

Bug: 26956807
Change-Id: Iaa42dfba5cf79ee64ac20cf4f1f3a4598f4275f4
2016-02-08 20:48:48 +00:00
Tao Bao
d8d14bec0d releasetools: Add two new entries to metadata.
Add "ota-required-cache" into the metadata file in an OTA package,
which shows the minimum free space on /cache to apply the update.

Add "ota-type" into the metadata file, which shows the OTA type for
this package (i.e. one of FILE, BLOCK and AB).

Also add the cache free space check into updater-script when generating
block-based incremental OTAs (we only had such lines for file-based
incrementals before).

Bug: 26731903
Change-Id: Id6ff0fc4cdfb1443636b0b3800b0f8bddb5bb1d0
2016-02-08 11:00:27 -08:00
Dirk Dougherty
01c63ddc2b Merge "Fix toggle icon in reference to match site-wide behavior." into mnc-docs 2016-02-06 01:45:34 +00:00
Dirk Dougherty
878d700e40 Fix toggle icon in reference to match site-wide behavior.
Change-Id: I0743cd456210921c50777a37e2cf4580f79be64d
2016-02-05 17:05:18 -08:00
Alex Deymo
f9f0a6180c Merge "ota_from_target_files: Include the payload properties." am: db82f72752
am: 07085a5113

* commit '07085a511385a9dfa71414735641f96119ec342c':
  ota_from_target_files: Include the payload properties.
2016-02-05 23:43:38 +00:00
Alex Deymo
07085a5113 Merge "ota_from_target_files: Include the payload properties."
am: db82f72752

* commit 'db82f72752532bf2b98103171b3d7cd8405b88e4':
  ota_from_target_files: Include the payload properties.
2016-02-05 23:16:47 +00:00
Alex Deymo
db82f72752 Merge "ota_from_target_files: Include the payload properties." 2016-02-05 23:11:18 +00:00
Colin Cross
d8f0d68b78 makeparallel: unset MAKEFLAGS and MAKELEVEL
makeparallel inherits values for MAKEFLAGS and MAKELEVEL from make
through the environment, but they should not be propagated to the child
process in case the child process tries to run make again.

Change-Id: I4c5df10ea8055cd1f1f61a892d5b1a7acb287bbb
2016-02-05 00:10:20 -08:00
Alex Deymo
19241c11bd ota_from_target_files: Include the payload properties.
When building an A/B OTA package, include the payload.bin properties as
a key-value pairs text file, so it can easily be passed to
update_engine during payload application.

Bug: 26991255
TEST=`ota_from_target_files out/dist/${BOARD}-target_files.zip full-ota.zip` includes the properties.

Change-Id: I445c8a8e412a8e16b48b6ee626db8e27d48a38a9
2016-02-04 23:29:50 -08:00
Amanda Kassay
9f2d9086d6 Merge "Full width search cover width bug fix." into mnc-docs 2016-02-04 14:58:35 +00:00
Neil Fuller
3d039178d7 Remove synchronized from the public API docs
The information is not useful. Javadoc hasn't included this
information for years.

Bug: 25767152
Change-Id: Ic0a398851b90fbf85785d5cf946e7f4c1aaa4be4
(cherry picked from commit a37bdc89b4)
2016-02-03 22:10:16 +00:00
Amanda Kassay
ef8d0d2811 Full width search cover width bug fix.
Change-Id: I32531f1096a41dc9949e5eb28105fa5ae56a4d3f
2016-02-03 15:53:04 -05:00
Dan Willemsen
ced2a7d6a1 Merge changes I2e00bb66,I00890229 am: 6c597e6bdd
am: 11b5b1c992

* commit '11b5b1c9925acf80dd42a184e92870d6bfa54736':
  Do not diff .odex files
  Diff libpac.so now that it is deterministic
2016-02-03 19:05:09 +00:00