Commit Graph

925 Commits

Author SHA1 Message Date
Dan Albert 39be2f64fd am d34b6378: Merge "Global C++11 compatibility."
* commit 'd34b63780eaf80ba71279360dc1e2fdbdc488eec':
  Global C++11 compatibility.
2014-11-20 23:00:40 +00:00
Dan Albert d34b63780e Merge "Global C++11 compatibility." 2014-11-20 21:21:14 +00:00
Dan Albert 32f9fe7fab Global C++11 compatibility.
Our build system compiles flex/bison as C++ rather than C, but a few
projects add `-x c` to their flags, forcing the compiler to compile
them as C. This causes the compiler to reject the global C++ standard
flag, so we need to explicitly provide a C standard flag to override
it.

Bug: 18466763
Change-Id: Id68ad9317261ed4d857a949b07288bd137ff6303
2014-11-20 13:17:35 -08:00
Heather Lee Wilson 71fa539243 am de27d4cb: am e5879c36: Byte swap to support BGRA in recovery mode
* commit 'de27d4cbb75a9c2f5ad0fc24edf5295d0f3d9fe0':
  Byte swap to support BGRA in recovery mode
2014-11-15 16:32:22 +00:00
Heather Lee Wilson de27d4cbb7 am e5879c36: Byte swap to support BGRA in recovery mode
* commit 'e5879c3639789d61803605c12371a4f291e0b3cc':
  Byte swap to support BGRA in recovery mode
2014-11-14 20:26:51 +00:00
Heather Lee Wilson e5879c3639 Byte swap to support BGRA in recovery mode
Fixes color palate of recovery mode when double buffer enabled.

Bug: 18169447
Change-Id: Ia50b0fb9afd8001dfd740c09ce109fa421e691f7
2014-11-14 12:00:18 -08:00
Yabin Cui 82ca0ba805 am 92242c70: Merge "kill HAVE_FORKEXEC"
* commit '92242c704846f28932e555dba800f4a701063896':
  kill HAVE_FORKEXEC
2014-11-13 19:10:18 +00:00
Yabin Cui 92242c7048 Merge "kill HAVE_FORKEXEC" 2014-11-13 18:14:54 +00:00
Yabin Cui 678f7d4a36 kill HAVE_FORKEXEC
Bug: 18317407
Change-Id: Idd4e0effa96752e2c0ca959728f80df4d2d34187
2014-11-12 16:51:45 -08:00
Michael Runge 8bebe58e54 am 2020564f: am be81e51c: Use more aggressive sync writing to applypatch.
* commit '2020564f21bb0216965f0f5c43c5c1c995785bab':
  Use more aggressive sync writing to applypatch.
2014-10-31 00:13:22 +00:00
Michael Runge c2e7d903ad am e908a454: am 042c3cd0: Force sync files written by minzip.
* commit 'e908a45420fc4194c6007193d21d5b690e04583f':
  Force sync files written by minzip.
2014-10-31 00:13:21 +00:00
Michael Runge 2020564f21 am be81e51c: Use more aggressive sync writing to applypatch.
* commit 'be81e51c171a0cf9b9b5045ee949282b7f36d779':
  Use more aggressive sync writing to applypatch.
2014-10-29 20:23:58 +00:00
Michael Runge be81e51c17 Use more aggressive sync writing to applypatch.
We have seen cases where the boot partition is patched, but upon
recovery the partition appears to be corrupted.  Open up all
patched files/partitions with O_SYNC, and do not ignore the
errors from fsync/close operations.

Bug: 18170529
Change-Id: I392ad0a321d937c4ad02eaeea9170be384a4744b
2014-10-29 13:00:21 -07:00
Michael Runge e908a45420 am 042c3cd0: Force sync files written by minzip.
* commit '042c3cd04ec3ef416019fa382cd5b1a942bd79e1':
  Force sync files written by minzip.
2014-10-29 18:51:51 +00:00
Michael Runge 042c3cd04e Force sync files written by minzip.
Some files appear to be missing their sync to disk.

Bug: 18145574
Change-Id: Ic858624a4dd65bbfc54d30f3a13c607078270345
2014-10-28 19:49:57 -07:00
Michael Runge 8a9ee089d3 am fe8563f4: am 5ddf4293: Log mount/unmount errors to UI
* commit 'fe8563f4f2a6efe1eb00bb41a5037c88917becfc':
  Log mount/unmount errors to UI
2014-10-24 23:39:40 +00:00
Michael Runge fe8563f4f2 am 5ddf4293: Log mount/unmount errors to UI
* commit '5ddf4293df45a051c7900eeb62fb5ec4950b6cb6':
  Log mount/unmount errors to UI
2014-10-24 23:17:43 +00:00
Michael Runge 5ddf4293df Log mount/unmount errors to UI
Bug: 18092022
Change-Id: I6c42038ebeb1cfc1e7ca0d3e12310fdce1b990b0
2014-10-24 14:14:41 -07:00
Nick Kralevich 944fc5e616 am 915d661c: am 68802416: unconditionally apply SELinux labels to symlinks
* commit '915d661ccc64f25a533919054f487a8e5943574d':
  unconditionally apply SELinux labels to symlinks
2014-10-24 17:52:40 +00:00
Nick Kralevich 915d661ccc am 68802416: unconditionally apply SELinux labels to symlinks
* commit '688024169df70336cc128ea8cc929174c53a501e':
  unconditionally apply SELinux labels to symlinks
2014-10-24 17:43:15 +00:00
Nick Kralevich 688024169d unconditionally apply SELinux labels to symlinks
At the end of the OTA script, we walk through /system, updating
all the permissions on the filesystem, including the UID, GID,
standard UNIX permissions, capabilities, and SELinux labels.

In the case of a symbolic link, however, we want to skip most of
those operations. The UID, GID, UNIX permissions, and capabilities
don't meaningfully apply to symbolic links.

However, that's not true with SELinux labels. The SELinux label on
a symbolic link is important. We need to make sure the label on the
symbolic link is always updated, even if none of the other attributes
are updated.

This change unconditionally updates the SELinux label on the symbolic
link itself. lsetfilecon() is used, so that the link itself is updated,
not what it's pointing to.

In addition, drop the ENOTSUP special case. SELinux has been a
requirement since Android 4.4. Running without filesystem extended
attributes is no longer supported, and we shouldn't even try to handle
non-SELinux updates anymore. (Note: this could be problematic if
these scripts are ever used to produce OTA images for 4.2 devices)

Bug: 18079773
Change-Id: I87f99a1c88fe02bb2914f1884cac23ce1b385f91
2014-10-23 20:46:33 -07:00
Michael Runge 45322f939a am da500cec: am 168f7778: Allow passing of mount args to mountFn
* commit 'da500cecf5b004498c0dd17bc27a30eb4b0b9a2d':
  Allow passing of mount args to mountFn
2014-10-23 22:15:29 +00:00
Brian Carlstrom d1e909e77d am 4da9cdea: am 473967d8: Merge "Log to UI any metadata setting errors" into lmp-dev
* commit '4da9cdeab97297e69075dd9b6cad9921cfae30b9':
  Log to UI any metadata setting errors
2014-10-23 22:15:28 +00:00
Michael Runge da500cecf5 am 168f7778: Allow passing of mount args to mountFn
* commit '168f77787700f0e9f66675beef33c593a777e64e':
  Allow passing of mount args to mountFn
2014-10-23 21:56:52 +00:00
Brian Carlstrom 4da9cdeab9 am 473967d8: Merge "Log to UI any metadata setting errors" into lmp-dev
* commit '473967d87ff9fc7a541c16ebdc56364c285d2862':
  Log to UI any metadata setting errors
2014-10-23 21:56:52 +00:00
Nick Kralevich 3e62e9d93e am d0602fbb: am 9b2db80d: Merge "Make /cache/recovery/last_log available in recovery" into lmp-dev
* commit 'd0602fbb88c095520d0fc88e821eb5557298e32b':
  Make /cache/recovery/last_log available in recovery
2014-10-23 20:41:00 +00:00
Michael Runge c224ac28ad am 3b5c6dca: am 2f0ef730: Treat already-renamed files as having no problems.
* commit '3b5c6dca0a448d1a09bf9adb905bc5a86230c7fc':
  Treat already-renamed files as having no problems.
2014-10-23 20:40:59 +00:00
Michael Runge 168f777877 Allow passing of mount args to mountFn
Bug: 18079773
Bug: 18092222

Change-Id: Ifc3f3e123de729dfbb2f49414b3207afa96268d5
2014-10-23 18:13:26 +00:00
Brian Carlstrom 473967d87f Merge "Log to UI any metadata setting errors" into lmp-dev 2014-10-23 17:18:13 +00:00
Michael Runge d4a63426ef Log to UI any metadata setting errors
Bug: 18079773
Change-Id: Ic6fddbcbcb6ddb9e1cbd1698df98387c0033ae15
2014-10-23 10:06:33 -07:00
Nick Kralevich d0602fbb88 am 9b2db80d: Merge "Make /cache/recovery/last_log available in recovery" into lmp-dev
* commit '9b2db80d407752fd524e799e4c7051162e63f91c':
  Make /cache/recovery/last_log available in recovery
2014-10-23 16:34:39 +00:00
Michael Runge 3b5c6dca0a am 2f0ef730: Treat already-renamed files as having no problems.
* commit '2f0ef73029fc51c6404121f338b034c8b516652c':
  Treat already-renamed files as having no problems.
2014-10-23 16:34:38 +00:00
Nick Kralevich 9b2db80d40 Merge "Make /cache/recovery/last_log available in recovery" into lmp-dev 2014-10-23 15:37:10 +00:00
Dan Albert 0745fbfad9 am c7249660: am 4f66469b: Merge "More test makefile cleanup."
* commit 'c7249660f908c74687b5fdadc1296eb9d4903cc7':
2014-10-23 13:04:57 +00:00
Dan Albert 440185cdd3 am ea5828a2: am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb.""
* commit 'ea5828a24f3a8f6a44e2f15e76cacdb5bc524db0':
2014-10-23 13:04:57 +00:00
Jeff Sharkey 3970568560 am e95ed95f: am a6e13ae0: Include reason when wiping data.
* commit 'e95ed95f05d22929e0bb8610a83c4e6a01fb3a33':
2014-10-23 13:04:56 +00:00
Elliott Hughes e5ce559fb6 am 78a30278: am 530b61e0: Merge "Copy epoll(2) changes to minadb."
* commit '78a30278607f0e57ace53eb5df7e5f7f196387a4':
2014-10-23 13:04:56 +00:00
Nick Kralevich a9ad0324d1 Make /cache/recovery/last_log available in recovery
Create a new recovery UI option to allow the user to view
/cache/recovery/last_log for their device. This gives enhanced
debugging information which may be necessary when a failed
OTA occurs.

Bug: 18094012
Change-Id: Ic3228de96e9bfc2a0141c7aab4ce392a38140cf3
2014-10-22 21:43:08 -07:00
Michael Runge 2f0ef73029 Treat already-renamed files as having no problems.
This should help with reentrant OTAs.

Bug: 18079773

Change-Id: I102fd738e3b450483ecd4471384c12e89fc586e2
2014-10-23 00:04:36 +00:00
JP Abgrall dd57886ce6 am 9eb8c8bd: init.rc: Inidicate that booting is complete wrt firwmare requests
* commit '9eb8c8bdbe4965e9a92d83882e97cf67aee20821':
  init.rc: Inidicate that booting is complete wrt firwmare requests
2014-10-21 17:42:56 +00:00
JP Abgrall 9eb8c8bdbe init.rc: Inidicate that booting is complete wrt firwmare requests
ueventd will wait for /dev/.booting to go away before giving up
on loading firmware.
The issue was introduced in Ifdd5dd1e95d7e064dde5c80b70198882d949a710
which forgot to update recovery's init.rc

Bug: 17993625
Change-Id: I91205fe6eea50aaef9b401d650ec8d6843a92a57
2014-10-20 20:02:57 -07:00
Dan Albert 5b7f5b15af am 4f66469b: Merge "More test makefile cleanup."
* commit '4f66469b29a34811b69518a266be31fe42cc111b':
  More test makefile cleanup.
2014-10-17 07:48:06 +00:00
Dan Albert c7249660f9 am 4f66469b: Merge "More test makefile cleanup."
* commit '4f66469b29a34811b69518a266be31fe42cc111b':
  More test makefile cleanup.
2014-10-17 07:47:57 +00:00
Dan Albert 4f66469b29 Merge "More test makefile cleanup." 2014-10-17 01:28:35 +00:00
Dan Albert 13f21c2bc7 More test makefile cleanup.
Global variables kill.
No need to manually link gtest, and that causes problems with
libc++.

Change-Id: If804cdd436cf1addfa9a777708efbc37c27770b6
2014-10-17 01:05:08 +00:00
Dan Albert 93ecb9383a am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb.""
* commit '28ffde5ebd33d5b693906a93087e6eea627cd8d0':
  Revert "Copy epoll(2) changes to minadb."
2014-09-26 16:12:34 +00:00
Dan Albert ea5828a24f am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb.""
* commit '28ffde5ebd33d5b693906a93087e6eea627cd8d0':
  Revert "Copy epoll(2) changes to minadb."
2014-09-26 16:12:23 +00:00
Dan Albert 28ffde5ebd Merge "Revert "Copy epoll(2) changes to minadb."" 2014-09-26 16:04:16 +00:00
Doug Zongker 91c2788851 am d83e4f15: support for version 2 of block image diffs
* commit 'd83e4f15890ac6ebe0d61924bd224eb1ae8565ad':
  support for version 2 of block image diffs
2014-09-26 14:54:01 +00:00
Doug Zongker d83e4f1589 support for version 2 of block image diffs
In version 2 of block image diffs, we support a new command to load
data from the image and store it in the "stash table" and then
subsequently use entries in the stash table to fill in missing bits of
source data we're not allowed to read when doing move/bsdiff/imgdiff
commands.

This leads to smaller update packages because we can break cycles in
the ordering of how pieces are updated by storing data away and using
it later, rather than not using the data as input to the patch system
at all.  This comes at the cost of the RAM or scratch disk needed to
store the data.

The implementation is backwards compatible; it can still handle the
existing version 1 of the transfer file format.

Change-Id: I4559bfd76d5403859637aeac832f3a5e9e13b63a
2014-09-25 16:38:14 -07:00