summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)Steve Block2012-01-1715-39/+48
| | | | Change-Id: I929ea38bc6fe6efeefa7870c8e7e4c19cd0029b3
* Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)Steve Block2012-01-1722-131/+140
| | | | Change-Id: Ia0476219b71ece949595515ee07ea072ed349d73
* Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)Steve Block2012-01-177-36/+45
| | | | Change-Id: Ia9a357dec5ad12eea93fd03401a3b02b38e4e94f
* Rename (IF_)LOG() to (IF_)ALOG()Steve Block2012-01-172-29/+37
| | | | Change-Id: Ifb82ae2c242becaffa3cf19e548b526e6616c2c7
* Merge "rmmod: fix full path syntax"Jean-Baptiste Queru2012-01-131-0/+2
|\
| * rmmod: fix full path syntaxTanguy Pruvot2012-01-121-0/+2
|/ | | | | | | rmmod /system/modules/multitouch.ko rmmod: delete_module '/multitouch' failed (errno 2) Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
* rootdir: convert all usages of $prop to ${prop}Dima Zavin2012-01-111-8/+8
| | | | | Change-Id: Ic2472606e869d23c0f499a192cd7bb21ca3cf5b5 Signed-off-by: Dima Zavin <dima@android.com>
* init: use init's property expansion code for setprop/writeDima Zavin2012-01-113-29/+18
| | | | | Change-Id: I3c284860cc8d5106ac2b086e62baeb6263873935 Signed-off-by: Dima Zavin <dima@android.com>
* init: delay importing files until after parsing the current fileDima Zavin2012-01-112-20/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | If we process the import directive inline, then the ordering of the commands for the "on xxx" sections would be a little unexpected. The init.rc files do not really have an implied order as to which section appears and gets processed first. The init code itself provides that ordering explicitly. For the user, the expectation is that if both the current file and the imported file define a section (e.g. "on init"), then the commands in the current file will be executed first, and then the ones from the imported file(s). The current implementation did not do that. It processed the import directive inline, and thus the imported (i.e. dependent) files would appear first in the command lists for the sections. This created unintended side effects and the solution would have been to try and put the import lines somewhere in the middle of the init file. This would be difficult to notice and hard to extract the dependencies. To solve this, we add the imports to a list for each file being parsed and process the list after finishing parsing the file. This provides predictable order for imports and provides a logical flow from the user perspective: the currently parsed file gets to run its commands before the files being imported. Change-Id: I06dc35ff286314060e16b18923683cd2787269de Signed-off-by: Dima Zavin <dima@android.com>
* init: export all androidboot cmd line values as ro.boot.xx propsDima Zavin2012-01-113-65/+99
| | | | | | | | Also, clean up how we initialize the ro.xx properties and process the kernel command line. Change-Id: Iedda6c90e31340a189171a44b2767480403354f7 Signed-off-by: Dima Zavin <dima@android.com>
* init: import the hardware specific init file in init.rcDima Zavin2012-01-112-2/+2
| | | | | | | | This removes the hardcoding of the file import in init and instead allows the init.rc file to fully control what is loaded. Change-Id: I933e5bbab57f1e8705a370d660f92c6508da94d2 Signed-off-by: Dima Zavin <dima@android.com>
* init: allow init file imports to use properties in namesDima Zavin2012-01-111-5/+136
| | | | | | | | | | | | | Adds new property syntax in init files during init file filename expansion during the import command: ${prop.name} So, one can do: import /init.${ro.hardware}.usb.rc Should convert other usages of property names to use the new function. Change-Id: I9205d7d7a2da620bc8e6b89ac0eb554fad53ded3 Signed-off-by: Dima Zavin <dima@android.com>
* init: initialize property area early at bootDima Zavin2012-01-111-21/+15
| | | | | | | | | | The property service is still started later, but the property area and the initial boot properties are initialized before the init.rc file is processed. This allows init.rc files to have access to boot properties during parsing. Change-Id: Iae9ed1093c821831a864b39ae6bc697e62b94757 Signed-off-by: Dima Zavin <dima@android.com>
* Add ALOG version of LOG_ASSERTSteve Block2012-01-091-0/+1
| | | | | | This is now required by some projects. Change-Id: If4015c6a9f2391b205d2886bcf7f6e51f371ce08
* Add ALOG versions of LOGD, LOGI, LOGW and LOGESteve Block2011-12-291-0/+12
| | | | | | These are now required by some projects. Change-Id: I0d51c950178504474d803620a6cd1c9f084804b5
* Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
|\ | | | | | | Change-Id: Iaea0ecf6fc4429640a1d8811ec2034ea0f9eb48e
| * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-130-0/+0
| |\
* | \ am 7cd3e0a3: Document ANativeWindow\'s buffer refcountingJesse Hall2011-12-131-12/+30
|\ \ \ | |/ / | | | | | | | | | * commit '7cd3e0a3a2f9b104cd6c04f699ae62c4577787e2': Document ANativeWindow's buffer refcounting
| * | Document ANativeWindow's buffer refcountingJesse Hall2011-12-121-12/+30
| | | | | | | | | | | | Change-Id: I5454e90afd1a1b7d4a75c503f8dca712dba33790
* | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
|\ \ \ | | |/ | |/| | | | Change-Id: I3f3a977f341cca1f9e0b4a0567fe5fb9f6dd7e0d
| * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-120-0/+0
| |\ \ | | |/ | |/|
* | | am b1dfffe6: Fix \'adb backup\' on WindowsChristopher Tate2011-12-091-2/+24
|\ \ \ | |/ / | | | | | | | | | * commit 'b1dfffe6bb506313a3bc9146d2f6f8c533213193': Fix 'adb backup' on Windows
| * | Fix 'adb backup' on WindowsChristopher Tate2011-12-091-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the same call sequence that 'adb pull' uses for creating the output file. adb_open_mode() apparently does not work on Windows hosts. Bug 5733007 Change-Id: I48d719c4657c93e19f6790cf1c6da610d49f5806
* | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-080-0/+0
|\ \ \ | | |/ | |/| | | | Change-Id: I90f80bed70319b9973996b74f78b421b87eef8e7
| * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-050-0/+0
| |\ \ | | |/ | |/|
| | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-280-0/+0
| | |\
| | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-220-0/+0
| | | |\
| | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-100-0/+0
| | | | |\
| | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-090-0/+0
| | | | | |\
| | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-080-0/+0
| | | | | | |\
| | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-020-0/+0
| | | | | | | |\
| | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-010-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-10-300-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-10-270-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-200-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-190-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-180-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-160-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-130-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-120-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-110-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-090-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-060-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-050-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-030-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\