Commit Graph

1694 Commits

Author SHA1 Message Date
Michael Runge 40dfc474c4 am c64e76c7: Merge "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add." into klp-dev
* commit 'c64e76c75088b951f61a7f7bacf8af6eccd2ccfa':
  Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
2013-11-07 15:00:42 -08:00
Michael Runge c64e76c750 Merge "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add." into klp-dev 2013-11-07 22:55:51 +00:00
Michael Runge ce7ca7165b Enable incremental builder to find files that moved, and
try to process them via patch + rename, instead of
delete + add.

b/11437930

Change-Id: I984349fbc9a8dac4379e00c0d66fc7d22c4eb834
2013-11-07 12:29:14 -08:00
Dees Troy 0226cd55ab Add reboot binary if it exists to recovery
Change-Id: I7efdba5cf4addf0036ea04ab76a8ecc2c3456e2a
2013-11-04 14:13:07 +00:00
Dees Troy 79ff74905b Fix merge conflicts 2013-11-04 14:01:22 +00:00
Dees Troy d63c7643fd Fix building of other utilities
Fix building all applypatch items
Fix building verifier_test (probably will not work right as-is)
but at least it builds without errors.

Change-Id: I7ab0c04d7d3d2c2e14b57480627e594f89a68b0b
2013-11-03 13:06:10 +00:00
Dees Troy ce8d8931ce Fix updater makefiles
Change-Id: Ie6262e3e80b1fd37f47b0f4a2ed343bd9f13b128
2013-11-03 02:49:35 +00:00
Dees Troy bb4c0cbc4b Fix merge conflicts and update for 4.4 kitkat
Make a copy of libmincrypt in TWRP source so we do not have to
ifdef verifier.cpp for various versions of mincrypt.

Remove reboot tool from toolbox (it was removed from 4.4 and did
not compile properly on some devices in older trees)
2013-11-02 20:43:26 +00:00
Kevin Steck 23f2c39906 Skip the = or \n before grabbing Zip_File.
Change-Id: I0454f8fc3cbe037fac63ef5861f8f373e4654d49
2013-10-24 20:40:22 +01:00
Dees Troy f4766921d4 Ensure root folders get added in split archives
Make sure that we add the root folder itself to get the perms and
SELinux contexts before splitting to a second archive.

Change-Id: Id93a9f9b4767b61bba38eb0cf7306c81a8540a3c
2013-10-24 21:33:39 +02:00
Dees Troy d8a26e0be9 Update licenses to all match
Change-Id: I3be70a897e563658736b2dec3a9ea2697b69b225
2013-10-24 21:30:42 +02:00
Dees Troy 3c71347f5a Fix spelling error
Change-Id: Id932ce1b99dee85feb788c513acad3384af6459e
2013-10-24 21:29:47 +02:00
Dees Troy 4c07ab3c0e Add toolbox_recovery rules
Build special limited toolbox with SELinux tools for recovery

Change-Id: Ifc76a6bd0468a72081f15ede2a68adf48af8a0f2
2013-10-24 21:27:54 +02:00
Dees Troy 7d5b71cbe2 Clean up init.rc 2013-10-23 20:29:55 +01:00
Dees Troy 14ca0259f9 Merge "fix getting and setting contexts in selinux" into android-4.3 2013-10-23 20:28:57 +01:00
bigbiff bigbiff d0c24c50d9 fix getting and setting contexts in selinux
recreate lost+found with selinux contexts

Change-Id: I19e8696d47319dfb641520956c8a27c2a796a0c3
2013-10-23 19:27:48 +00:00
Dees Troy fb9f7f3c7f Merge "Remove trailing spaces on auto generated backup names" into android-4.3 2013-10-23 20:10:15 +01:00
Dees Troy 3be70a897e Update licenses to all match 2013-10-22 14:25:12 +00:00
Kevin Steck 7b69e9d111 Skip the = or \n before grabbing Zip_File.
Change-Id: I0454f8fc3cbe037fac63ef5861f8f373e4654d49
2013-10-22 14:03:30 +00:00
Dees Troy d932ce1b99 Fix spelling error 2013-10-18 17:12:59 +00:00
Dees Troy 0cd27a85bc Clean up init.rc 2013-10-18 17:10:12 +00:00
bigbiff bigbiff c49d706903 fix getting and setting contexts in selinux
recreate lost+found with selinux contexts

Change-Id: I19e8696d47319dfb641520956c8a27c2a796a0c3
2013-10-17 16:49:49 +00:00
Dees Troy 0241670122 Merge "Ensure root folders get added in split archives" into twrp2.7 2013-10-17 11:45:09 -05:00
Dees Troy c01ed9e9e2 Merge "Add toolbox_recovery rules" into twrp2.7 2013-10-17 11:44:11 -05:00
Dees Troy e6ddddca76 Merge "Add conditions support to GUIImage" into twrp2.7 2013-10-17 11:43:44 -05:00
Dees Troy ed40077534 Ensure root folders get added in split archives
Make sure that we add the root folder itself to get the perms and
SELinux contexts before splitting to a second archive.

Change-Id: Id93a9f9b4767b61bba38eb0cf7306c81a8540a3c
2013-10-17 11:42:05 -05:00
Ed Heyl 92a4f94478 am a370c0f7: am 3966c571: merge in klp-release (no-op)
* commit 'a370c0f7fe65d6f012902342249d3a84b474f277':
2013-10-16 17:49:14 -07:00
Ed Heyl a370c0f7fe am 3966c571: merge in klp-release (no-op)
* commit '3966c571a0c36a40a8142e70b1aa6de547ea6ec3':
2013-10-16 17:44:12 -07:00
Ed Heyl 3966c571a0 merge in klp-release (no-op) 2013-10-16 17:34:54 -07:00
Dees Troy a829d5deb2 Remove trailing spaces on auto generated backup names
Trailing spaces sometimes cause folder creation depending on what
file system is in use (e.g. vfat).
2013-10-17 00:26:34 +00:00
Dees Troy 8d66f8bda9 Add toolbox_recovery rules
Build special limited toolbox with SELinux tools for recovery

Change-Id: Ifc76a6bd0468a72081f15ede2a68adf48af8a0f2
2013-10-16 19:46:29 +00:00
Kenny Root 9f6bfa302a am fc7eab96: am f4a6ab27: Merge "Add support for ECDSA signatures"
* commit 'fc7eab961f9dc85ee88e8c37ca1dc31a7f7b8331':
  Add support for ECDSA signatures
2013-10-14 14:12:49 -07:00
Kenny Root fc7eab961f am f4a6ab27: Merge "Add support for ECDSA signatures"
* commit 'f4a6ab27b335b69fbc419a9c1ef263004b561265':
  Add support for ECDSA signatures
2013-10-14 14:08:21 -07:00
Kenny Root f4a6ab27b3 Merge "Add support for ECDSA signatures" 2013-10-14 21:04:56 +00:00
Vojtech Bocek 6041a78f8f Add conditions support to GUIImage
Signed-off-by: Vojtech Bocek <vbocek@gmail.com>
2013-10-11 14:41:39 +02:00
Kenny Root 7a4adb5268 Add support for ECDSA signatures
This adds support for key version 5 which is an EC key using the NIST
P-256 curve parameters. OTAs may be signed with these keys using the
ECDSA signature algorithm with SHA-256.

Change-Id: Id88672a3deb70681c78d5ea0d739e10f839e4567
2013-10-10 14:19:19 -07:00
Ed Heyl a47beb5dac am 053c1c5e: am 7fdeb1f9: merge in KQS81M
* commit '053c1c5e89136bd78c39c9e4a300d95f1cb3772d':
  Don't apply permission changes to symlink.
  recovery: fix use of init reboot method
2013-10-09 09:12:02 -07:00
Ed Heyl 053c1c5e89 am 7fdeb1f9: merge in KQS81M
* commit '7fdeb1f9d7c1e979ebf78725bbf000bcb8c6ffc3':
  Don't apply permission changes to symlink.
  recovery: fix use of init reboot method
2013-10-08 15:45:46 -07:00
Ed Heyl 7fdeb1f9d7 merge in KQS81M 2013-10-08 15:35:29 -07:00
The Android Automerger 91321f60ae merge in klp-release history after reset to klp-dev 2013-10-03 06:01:22 -07:00
Michael Runge f0af761369 am efef45ed: am a2a1ce82: Allow child classes to override the overlay location for the update image.
* commit 'efef45ede6f7588bd3f584d7746ca9822ade58ac':
  Allow child classes to override the overlay location for the update image.
2013-10-02 20:28:01 -07:00
Michael Runge efef45ede6 am a2a1ce82: Allow child classes to override the overlay location for the update image.
* commit 'a2a1ce823b8c76451ee2b38155b347b0c2ced714':
  Allow child classes to override the overlay location for the update image.
2013-10-02 17:00:24 -07:00
Michael Runge a2a1ce823b Allow child classes to override the overlay location for the
update image.

b/10952479

Change-Id: I59bb834f271f702fb529054dab7926b816fa35cc
2013-10-02 16:31:07 -07:00
Dees Troy 7e176dab1b Merge "check for space after = too" into twrp2.7 2013-10-01 10:34:50 -05:00
Dees Troy 0221bd9c4d Merge "Improvements to Update_Log_File" into twrp2.7 2013-10-01 10:34:15 -05:00
Dees Troy e34c9070a5 Merge "Fix checking for file_contexts in updater" into twrp2.7 2013-10-01 10:24:08 -05:00
Dees Troy d29b3361f0 Fix checking for file_contexts in updater 2013-10-01 15:21:12 +00:00
Bjorn Andersson 80a7a4642b screen_ui: Initialize text buffer
Zero initialize the text buffer to make recovery not
render garbage when showing the menu or messages.

Change-Id: I0dd0d357757f6b0fd52ad3b3617d42bb1b835245
2013-09-30 13:57:49 -07:00
Doug Zongker 58207b84d3 fix use of RGBA images in minui
Bug: 10934401
Change-Id: I471b30e5b2e877c620e4a0a524e950cddbc6d2c0
2013-09-25 16:41:07 -07:00
Kenny Root bb83e14c49 am dd92a4d6: am 58c60900: Merge "verifier: update to support certificates using SHA-256"
* commit 'dd92a4d625a6735651efeb12a5707620bc5c6339':
  verifier: update to support certificates using SHA-256
2013-09-25 10:23:05 -07:00