summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-08-08Merge "updater: Switch to C++ and fix the build."HEADandroid-m-preview-2mastermainTao Bao
2015-08-07updater: Switch to C++ and fix the build.Tao Bao
Change-Id: I632201f74b26685cb7a5b3e75ef50163e8973308
2015-05-06Merge "Whitelist device for stlport."android-m-preview-1android-m-previewDan Albert
2015-05-06Whitelist device for stlport.Dan Albert
Bug: http://b/15193147 Change-Id: I3fbef1eb70622dc9016d759900d55e89b345d583
2015-02-26am c9ea3e42: Merge "Separate keymaster0 and keymaster1 HALs."android-wear-5.1.1_r1android-wear-5.1.0_r1master-soongShawn Willden
* commit 'c9ea3e425452819f6be82da22d58211bf04fac10': Separate keymaster0 and keymaster1 HALs.
2015-02-26Merge "Separate keymaster0 and keymaster1 HALs."Shawn Willden
2015-02-26Separate keymaster0 and keymaster1 HALs.Shawn Willden
Change-Id: Ida47d6fae1ed7e85e7c223900f6b7a2e655fee47
2015-01-23am 80814764: Merge "Remove superfluous OpenSSL include paths."Kenny Root
* commit '808147646811f6c0ba60b24720d81cc06e480a05': Remove superfluous OpenSSL include paths.
2015-01-23Merge "Remove superfluous OpenSSL include paths."Kenny Root
2015-01-22Remove superfluous OpenSSL include paths.Adam Langley
The libcrypto and libssl modules (and their respective static and host versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module is sufficient. Change-Id: Ic9fa10cdda20c911f83019f693924180f26c6321
2014-12-04am 2f96dbf9: Remove journaling from read-only FS to save spaceJP Abgrall
* commit '2f96dbf9011d63b7109e95dc1dbe71faea853f1f': Remove journaling from read-only FS to save space
2014-12-03Remove journaling from read-only FS to save spaceandroid-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-releaselollipop-mr1-devJP Abgrall
The read-only partitions don't need journaling. Bug: 18430740 Change-Id: I44b88c43a506d8b64f7cf00910136cfe1c524c24
2014-12-01am b87d6d2a: tilapia: emulate sdcard using 4 threadsIliyan Malchev
* commit 'b87d6d2a885cace025b33d6508b3b637dc113b05': tilapia: emulate sdcard using 4 threads
2014-12-01am 6f5371f2: tilapia: chown and chmod core_lock_{count,period} sysfs filesIliyan Malchev
* commit '6f5371f2d8e4a888389596e3964b40368859b75d': tilapia: chown and chmod core_lock_{count,period} sysfs files
2014-12-01tilapia: emulate sdcard using 4 threadsIliyan Malchev
This overrides the default of 2 threads. Change-Id: I8693043c1f1dce27c6606aab31f57176d870a759 Signed-off-by: Iliyan Malchev <malchev@google.com>
2014-11-27tilapia: chown and chmod core_lock_{count,period} sysfs filesIliyan Malchev
Change-Id: I6713a1bed0e17f58ccc28c45751271b8591f964b Signed-off-by: Iliyan Malchev <malchev@google.com>
2014-11-08am 495f0a9b: Merge "Ensure /radio directory exists in recovery"Nick Kralevich
* commit '495f0a9b2064a129af669e9959c2027f984e889c': Ensure /radio directory exists in recovery
2014-11-08Merge "Ensure /radio directory exists in recovery"android-wear-5.0.0_r1lollipop-wear-releaseNick Kralevich
2014-11-07Ensure /radio directory exists in recoveryNick Kralevich
This directory is needed for nakasig radio OTAs to be successfully applied. (cherrypicked from commit f3208df5982acf96831b8d34a4396807e3b1a107) Bug: 18281224 Change-Id: I9319c3105c5d5aad5c6e21d5c60cf83043a25a1f
2014-11-07am f3208df5: Ensure /radio directory exists in recoveryNick Kralevich
* commit 'f3208df5982acf96831b8d34a4396807e3b1a107': Ensure /radio directory exists in recovery
2014-11-07Ensure /radio directory exists in recoveryNick Kralevich
This directory is needed for nakasig radio OTAs to be successfully applied. Bug: 18281224 Change-Id: I9319c3105c5d5aad5c6e21d5c60cf83043a25a1f
2014-10-25am c1c7c86b: Merge commit \'388f3b9d233f1beccfcdcdbdaee068983dd0fa40\' into HEADBill Yi
* commit 'c1c7c86b18875d1525d85e43bd83263f20429697':
2014-10-23am dbcd8921: Merge "Use touch_fw_update.sh"Nick Kralevich
* commit 'dbcd8921423228a57c95b640f6675ada687d301a': Use touch_fw_update.sh
2014-10-23am e5033bc8: Merge "Indicate this uses dlmalloc."Christopher Ferris
* commit 'e5033bc80764067cbb1c9dc3970f0718e35ae8c7': Indicate this uses dlmalloc.
2014-10-22Merge commit '388f3b9d233f1beccfcdcdbdaee068983dd0fa40' into HEADBill Yi
2014-10-21Merge "Use touch_fw_update.sh"Nick Kralevich
2014-10-21Use touch_fw_update.shNick Kralevich
Modify init.tilapia.rc to use /system/bin/touch_fw_update.sh instead of hardcoding the shell script into init.tilapia.rc. Depends on device/asus/grouper change Ib1a72f523d68758531a955355e1cd1eb2cd12f56 Bug: 18062250 Change-Id: I4096617b414da596aa4b6736b1c9a3c708fd5135
2014-10-16Remove unsupported sounds during bugreport.lollipop-devJeff Sharkey
Bug: 17997113 Change-Id: I763397fe957ea1fbf0b600c41160624afcf4da92
2014-09-26Fix missing config values for tilapiaJorim Jaggi
Bug: 17522143 Change-Id: I7a3ac5aa82d4fa9d351301c27e00f0c68b34c283
2014-07-11Indicate this uses dlmalloc.Christopher Ferris
(cherry picked from commit c5258394a2a448fedcf80a45b0111b9667f8a4fe) Change-Id: Ida9b67d4418d647046d2174d872109114e772083
2014-07-10Merge "Indicate this uses dlmalloc."android-l-preview_r2l-previewChristopher Ferris
2014-07-10Indicate this uses dlmalloc.Christopher Ferris
Change-Id: Iaf5fd1f01487f4c63ccfef30d75a131485a3506c
2014-04-30am f0b56819: am d6a03e18: Merge commit ↵Bill Yi
\'c453ec2f82ce9912d415655bfea4cd14374626c7\' into HEAD * commit 'f0b56819c659d27fb4867e9164d02cceb65c6739':
2014-04-30am d6a03e18: Merge commit \'c453ec2f82ce9912d415655bfea4cd14374626c7\' into HEADBill Yi
* commit 'd6a03e1876a36580f190130daa6e5b78314675a6':
2014-04-29Merge commit 'c453ec2f82ce9912d415655bfea4cd14374626c7' into HEADBill Yi
2014-04-09am 16559f75: am 8b79009e: Merge "Remove rm_ts_service"Nick Kralevich
* commit '16559f75f3bec9edc9b78934e933dbb271815027': Remove rm_ts_service
2014-04-09am 8b79009e: Merge "Remove rm_ts_service"Nick Kralevich
* commit '8b79009e845a7b42a5d5dc10a5fc13cc2bef17e9': Remove rm_ts_service
2014-04-08Merge "Remove rm_ts_service"idea133-weekly-releaseNick Kralevich
2014-04-04Remove rm_ts_serviceNick Kralevich
Resolves the following init error message: <3>[ 10.881438] init: cannot find '/system/bin/rm_ts_server', disabling 'rm_ts_service' Change-Id: I579f6c73c0e9f1d92b5b8139188ca2f90e0e7adc
2014-04-01Add extract-lists.txt for asus/tilapiaBill Yi
Change-Id: Ia97f4adb966cd294fe14fb4fcc0344f152d736a3
2014-04-01remove custom recovery UI for tilapiaDoug Zongker
All its functionality is now in the default UI. Change-Id: I3c4242f6cc03bc36fbff891ecc00902e0a410f14
2014-03-11am 81281df6: Merge "Drop restorecon on block device."Nick Kralevich
* commit '81281df6a92e810da59fecb108e034c08ddf707e': Drop restorecon on block device.
2014-03-11am e6678931: Merge "Drop restorecons from init.tilapia.rc file."Nick Kralevich
* commit 'e6678931e17612d5ef86db5c0d9fe0ce96112192': Drop restorecons from init.tilapia.rc file.
2014-03-11am 4ce318bb: Merge "Add missing restorecon calls."Nick Kralevich
* commit '4ce318bbf4b7036ed2a5a4051bf163f1d74c6100': Add missing restorecon calls.
2014-03-07am 75544ad1: Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to ↵Nick Kralevich
main init.rc file." * commit '75544ad199c633a825b8d370dcb2eade87aa0300': Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
2014-03-04am 53b41b23: am 81281df6: Merge "Drop restorecon on block device."Nick Kralevich
* commit '53b41b23584d5954747705497d629ef9f2282f92': Drop restorecon on block device.
2014-03-04am 81281df6: Merge "Drop restorecon on block device."Nick Kralevich
* commit '81281df6a92e810da59fecb108e034c08ddf707e': Drop restorecon on block device.
2014-03-04Merge "Drop restorecon on block device."Nick Kralevich
2014-03-04Drop restorecon on block device.Robert Craig
No policy is in place to actually deal with this block device. So drop the unneeded restorecon. Change-Id: Ib2a1c296ebb0f7c614185f69e0ddba218124e632 Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-03-03am a94132a9: am e6678931: Merge "Drop restorecons from init.tilapia.rc file."Nick Kralevich
* commit 'a94132a9f42c605a24e3345a0f0d14ee70d8a3e2': Drop restorecons from init.tilapia.rc file.