summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am da1c81ab: am a230c4d0: Reference kernel notice in the new locationJean-Baptiste Queru2012-01-061-1/+1
|\
| * am a230c4d0: Reference kernel notice in the new locationJean-Baptiste Queru2012-01-061-1/+1
| |\
| | * Reference kernel notice in the new locationJean-Baptiste Queru2012-01-061-1/+1
* | | Include toolchain makefile based on the current config.Ying Wang2012-01-064-6/+8
* | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-052-3/+3
* | | Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"Steve Block2012-01-051-1/+1
|\ \ \
| * | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-041-1/+1
* | | | Add hm/hmm/hmmm command.Jeff Davidson2012-01-051-0/+11
* | | | am 943f9a58: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-050-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-050-0/+0
| |\ \ \
| | * | | IMM04The Android Automerger2012-01-041-13/+3
| | * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-040-0/+0
| | |\ \ \
* | | \ \ \ am 1964c8ed: am d8765f0f: am 80cfc37d: Partial fix for emulator under Lion.Al Sutton2012-01-051-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am d8765f0f: am 80cfc37d: Partial fix for emulator under Lion.Al Sutton2012-01-041-1/+2
| |\ \ \ \ \
| | * \ \ \ \ am 80cfc37d: Partial fix for emulator under Lion.Al Sutton2012-01-041-1/+2
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Partial fix for emulator under Lion.Al Sutton2012-01-041-1/+2
* | | | | | | am 6a203293: Merge commit \'9a46327e\' into ics-mr1-plus-aospEd Heyl2012-01-050-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Merge commit '9a46327e' into ics-mr1-plus-aospEd Heyl2012-01-040-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| |
| | * | | increment version to 4.0.4Ed Heyl2012-01-041-1/+1
* | | | | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-032-57/+57
* | | | | Default LOCAL_SDK_RES_VERSION to LOCAL_SDK_VERSIONYing Wang2012-01-031-0/+5
* | | | | Add CSR to the list of known vendorsJean-Baptiste Queru2011-12-281-0/+1
* | | | | am f3c068db: (-s ours) am d38c870d: Get build system to work with Make 3.82Conley Owens2011-12-270-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am d38c870d: Get build system to work with Make 3.82Conley Owens2011-12-222-2/+4
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Get build system to work with Make 3.82Conley Owens2011-12-222-2/+4
* | | | | Remove the restriction that PHONY_PACKAGE needs LOCAL_REQUIRED_MODULESYing Wang2011-12-221-4/+0
* | | | | Merge "Get build system to work with Make 3.82"Conley Owens2011-12-222-2/+4
|\ \ \ \ \
| * | | | | Get build system to work with Make 3.82Conley Owens2011-12-222-2/+4
* | | | | | Merge "Make asm-3.1 an optional module, remove from grandfathered list"Tor Norbye2011-12-221-1/+0
|\ \ \ \ \ \
| * | | | | | Make asm-3.1 an optional module, remove from grandfathered listTor Norbye2011-12-051-1/+0
* | | | | | | We should include factory ramdisk if one shot makefile is NOT defined.Ying Wang2011-12-211-1/+1
* | | | | | | am 657aeac8: am 9ce06f11: Don\'t run ranlib on MacOS 10.7Al Sutton2011-12-211-1/+5
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am 9ce06f11: Don\'t run ranlib on MacOS 10.7Al Sutton2011-12-211-1/+5
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Don't run ranlib on MacOS 10.7Al Sutton2011-12-211-1/+5
* | | | | | | am 05e98055: am 60fe963c: build: explicitly define dependency filesAtte Peltomaki2011-12-211-4/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 60fe963c: build: explicitly define dependency filesAtte Peltomaki2011-12-211-4/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | build: explicitly define dependency filesAtte Peltomaki2011-12-211-4/+4
* | | | | | | Merge "Disable factory ramdisk if build with mm/mmm"Ying Wang2011-12-211-0/+4
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Disable factory ramdisk if build with mm/mmmYing Wang2011-12-211-0/+4
* | | | | | | Merge "Allow make 3.82 to be used under Cygwin 1.7"Raphael2011-12-211-1/+4
|\ \ \ \ \ \ \
| * | | | | | | Allow make 3.82 to be used under Cygwin 1.7Raphael2011-12-191-1/+4
* | | | | | | | Merge "Add 2 SDK directories that can build under Cygwin/Mingw"Raphael2011-12-211-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | |
| * | | | | | Add 2 SDK directories that can build under Cygwin/MingwRaphael2011-12-191-0/+2
* | | | | | | Fix multiple modules with the same name in FACTORY_RAMDISK_MODULESYing Wang2011-12-211-13/+29
* | | | | | | am a4b72c9f: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-210-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-210-0/+0
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | IML81The Android Automerger2011-12-201-13/+3
| | * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-200-0/+0
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge "Filter out static library in PRODUCT_FACTORY_RAMDISK_MODULES"Ying Wang2011-12-201-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Filter out static library in PRODUCT_FACTORY_RAMDISK_MODULESYing Wang2011-12-201-1/+3