Commit Graph

978 Commits

Author SHA1 Message Date
Ying Wang dd2f248a07 am cdce7f7e: am c43b17f0: Merge "Fix recovery image build for 32p"
* commit 'cdce7f7e552c036ec6fb406e9dabef615b11c1a9':
  Fix recovery image build for 32p
2014-12-02 00:14:33 +00:00
Ying Wang cdce7f7e55 am c43b17f0: Merge "Fix recovery image build for 32p"
* commit 'c43b17f0adac1092e221ce6166ca8bc464090525':
  Fix recovery image build for 32p
2014-12-02 00:07:35 +00:00
Ying Wang c43b17f0ad Merge "Fix recovery image build for 32p" 2014-12-01 23:59:21 +00:00
Bruce Beare 4c3c7a962f 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: Iea2d5f412740c082795da4358765751138a4b167
2014-11-30 19:21:19 -08:00
Michael Runge e7b0f60883 am 0fe938c0: am 5b9c4ce5: am b278c252: Add support for tune2fs file operations
* commit '0fe938c0fbebfdd3f6dedb0761588a20e741c870':
  Add support for tune2fs file operations
2014-11-24 18:18:43 +00:00
Michael Runge 0fe938c0fb am 5b9c4ce5: am b278c252: Add support for tune2fs file operations
* commit '5b9c4ce5a15bb76919e1556ae59993e9c310c0bc':
  Add support for tune2fs file operations
2014-11-24 18:06:43 +00:00
Michael Runge 5b9c4ce5a1 am b278c252: Add support for tune2fs file operations
* commit 'b278c252e148798346f85fc92eeea6afeb33fbf0':
  Add support for tune2fs file operations
2014-11-24 02:37:03 +00:00
Michael Runge acf47db238 Add support for tune2fs file operations
This allows tune2fs to be executed from within OTA scripts,
allowing for file system modifications without formatting the
partition

Bug: 18430740
Change-Id: I0c2e05b5ef4a81ecea043e9b7b99b545d18fe5e6
2014-11-21 21:10:20 -08:00
Michael Runge b278c252e1 Add support for tune2fs file operations
This allows tune2fs to be executed from within OTA scripts,
allowing for file system modifications without formatting the
partition

Bug: 18430740
Change-Id: I0c2e05b5ef4a81ecea043e9b7b99b545d18fe5e6
2014-11-21 13:02:03 -08:00
Dan Albert db1044ab6b am 39be2f64: am d34b6378: Merge "Global C++11 compatibility."
* commit '39be2f64fdcfe4aded40fa83a4b212bb8a5de1e3':
  Global C++11 compatibility.
2014-11-20 23:18:56 +00:00
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 f3958d07a3 am 71fa5392: am de27d4cb: am e5879c36: Byte swap to support BGRA in recovery mode
* commit '71fa5392439bf7ec55bda58924d3180539f80972':
  Byte swap to support BGRA in recovery mode
2014-11-15 16:41:54 +00: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 84b2cbee2a am 82ca0ba8: am 92242c70: Merge "kill HAVE_FORKEXEC"
* commit '82ca0ba805307f2c8bf4a3abb03fd7e1b5213ccb':
  kill HAVE_FORKEXEC
2014-11-14 00:47:19 +00: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 9537d92ff5 am 8bebe58e: am 2020564f: am be81e51c: Use more aggressive sync writing to applypatch.
* commit '8bebe58e540b34078aecd155e7b58a7a02985483':
  Use more aggressive sync writing to applypatch.
2014-10-31 00:26:30 +00:00
Michael Runge 60a473d298 am c2e7d903: am e908a454: am 042c3cd0: Force sync files written by minzip.
* commit 'c2e7d903adca4195588be085011c2a6a9c80426a':
  Force sync files written by minzip.
2014-10-31 00:26:30 +00: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
Badhri Jagan Sridharan b5b43043fa adbd: Support for new f_fs descriptor format
The patch "[RFC] usb: gadget: f_fs: Add flags
to  descriptors block" marks the current
usb_functionfs_descs_head format deprecated
and introduces support for sending SuperSpeed
descriptors.

This CL makes adbd to send Descriptors in the
new format. Adbd would fall back to the old
format, if kernel is not able to recognize
the new format. This is done to prevent
adbd from breaking in the older versions
of the kernel.

Bug: 17394972
Change-Id: I1acf684ef8a4dcc612ac20b5abe1e27b43901031
Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
2014-10-28 02:00:32 +00:00
Michael Runge f997340fe8 am 8a9ee089: am fe8563f4: am 5ddf4293: Log mount/unmount errors to UI
* commit '8a9ee089d380bcbd2f4447770b944a552001fd28':
  Log mount/unmount errors to UI
2014-10-25 02:37:16 +00: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 cb83d7a420 am 944fc5e6: am 915d661c: am 68802416: unconditionally apply SELinux labels to symlinks
* commit '944fc5e616b6f70da3447fc6987fb2f92dfdc01f':
  unconditionally apply SELinux labels to symlinks
2014-10-24 17:57:23 +00: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 257a0e9ef8 am 45322f93: am da500cec: am 168f7778: Allow passing of mount args to mountFn
* commit '45322f939a5bf66d378aab57e1fee1aa29ff9469':
  Allow passing of mount args to mountFn
2014-10-23 22:23:02 +00:00
Brian Carlstrom 661478eef6 am d1e909e7: am 4da9cdea: am 473967d8: Merge "Log to UI any metadata setting errors" into lmp-dev
* commit 'd1e909e77d6c20aa88630a86d7a93de54d5cf2af':
  Log to UI any metadata setting errors
2014-10-23 22:22:59 +00: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 efcdf752b1 am 3e62e9d9: am d0602fbb: am 9b2db80d: Merge "Make /cache/recovery/last_log available in recovery" into lmp-dev
* commit '3e62e9d93e97e39c260b62ac230002ae21ed4d96':
  Make /cache/recovery/last_log available in recovery
2014-10-23 20:44:56 +00:00
Michael Runge e2aa0b8ad6 am c224ac28: am 3b5c6dca: am 2f0ef730: Treat already-renamed files as having no problems.
* commit 'c224ac28adf1248dcd5716a0c6ed77825418fe0d':
  Treat already-renamed files as having no problems.
2014-10-23 20:44:55 +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