summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Fix build.Ying Wang2012-07-262-2/+5
* resolved conflict in mergre to goog/masterEd Heyl2012-07-261-1/+0
|\
| * am 07a06f6e: am f0daadf6: am 297d6c02: Merge "Add property_contexts to SELINU...Nick Kralevich2012-07-251-1/+1
| |\
| * | Add -fuse-ld=bfd to x86 targetAndrew Hsieh2012-07-251-1/+2
* | | am 4ae631f4: am c11b5efa: Merge "Should have been included in 74e883d1415f68d...Joe Onorato2012-07-251-7/+7
|\ \ \
| * \ \ am c11b5efa: Merge "Should have been included in 74e883d1415f68dc52a7e679cd1e...Joe Onorato2012-07-251-7/+7
| |\ \ \
| | * | | Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bbJoe Onorato2012-07-251-7/+7
* | | | | am e3adc7fd: am c22da7d7: Merge "Don\'t try to build the emulator on Mac OS i...Joe Onorato2012-07-251-4/+26
|\ \ \ \ \ | |/ / / /
| * | | | am c22da7d7: Merge "Don\'t try to build the emulator on Mac OS if the right t...Joe Onorato2012-07-251-4/+26
| |\ \ \ \ | | |/ / /
| | * | | Don't try to build the emulator on Mac OS if the right tools aren't installed.Joe Onorato2012-07-251-4/+26
* | | | | am c759e468: am b7391efb: Merge "Add -fuse-ld=bfd to x86 target"Andrew Hsieh2012-07-251-0/+2
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | am b7391efb: Merge "Add -fuse-ld=bfd to x86 target"Andrew Hsieh2012-07-251-0/+2
| |\ \ \ | | |/ /
| | * | Add -fuse-ld=bfd to x86 targetAndrew Hsieh2012-07-251-0/+2
* | | | am f0daadf6: am 297d6c02: Merge "Add property_contexts to SELINUX_DEPENDS."Nick Kralevich2012-07-251-1/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | am 297d6c02: Merge "Add property_contexts to SELINUX_DEPENDS."Nick Kralevich2012-07-251-1/+1
| |\ \ | | |/
| | * Merge "Add property_contexts to SELINUX_DEPENDS."Nick Kralevich2012-07-181-1/+1
| | |\
| | | * Add property_contexts to SELINUX_DEPENDS.rpcraig2012-07-051-1/+1
| | * | Create telephony-common and mms-common - DO NOT MERGEWink Saville2012-07-171-1/+1
* | | | resolved conflicts for merge of a8df6091 to masterYing Wang2012-07-232-3/+7
|\ \ \ \ | |/ / /
| * | | am 28437aac: Add LOCAL_SOURCE_FILES_ALL_GENERATED supportYing Wang2012-07-232-3/+7
| |\ \ \
| | * | | Add LOCAL_SOURCE_FILES_ALL_GENERATED supportYing Wang2012-07-192-3/+7
| | * | | Android 4.1.2 version bumpJustin Ho2012-07-121-1/+1
| | * | | 4.1.1Ed Heyl2012-07-031-2/+1
* | | | | pdk: add telephony-common and mms-commonColin Cross2012-07-181-1/+3
* | | | | Merge commit 'c16c9454' into mitWink Saville2012-07-111-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Create telephony-common and mms-commonWink Saville2012-07-061-1/+1
| | |/ / | |/| |
* | | | am 9ffe27e0: am 9e38d6bf: Merge "This property is set when HAVE_SELINUX:=true...Ying Wang2012-07-031-0/+4
|\ \ \ \ | |/ / /
| * | | am 9e38d6bf: Merge "This property is set when HAVE_SELINUX:=true during build."Ying Wang2012-07-031-0/+4
| |\ \ \ | | | |/ | | |/|
| | * | This property is set when HAVE_SELINUX:=true during build.William Roberts2012-07-031-0/+4
* | | | am d512fda4: am e42ed0ba: Merge "Move the llvm-gcc warning from HOST_darwin-x...Ying Wang2012-06-292-10/+12
|\ \ \ \ | |/ / /
| * | | am e42ed0ba: Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main...Ying Wang2012-06-292-10/+12
| |\ \ \ | | |/ /
| | * | Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mkYing Wang2012-06-282-10/+12
* | | | Merge "Don't fail if a target of type NONE has a NOTICE file present"Steve Block2012-06-271-0/+5
|\ \ \ \
| * | | | Don't fail if a target of type NONE has a NOTICE file presentSteve Block2012-06-271-0/+5
* | | | | Disable libcompiler-rt-extras for BUILD_TINY_ANDROID.Stephen Hines2012-06-261-2/+2
* | | | | am 4a65f812: am 6e587f53: Merge "Profiling use aprof, enable by LOCAL_ENABLE_...Jean-Baptiste Queru2012-06-225-0/+43
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am 6e587f53: Merge "Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCA...Jean-Baptiste Queru2012-06-225-0/+43
| |\ \ \ | | |/ /
| | * | Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNIKito Cheng2012-06-155-0/+43
* | | | resolved conflicts for merge of 9b76c054 to masterYing Wang2012-06-193-10/+19
|\ \ \ \ | |/ / /
| * | | am 0872a010: Merge "More flexibility to keep/remove R.class in static Java li...Ying Wang2012-06-193-10/+19
| |\ \ \ | | | |/ | | |/|
| | * | More flexibility to keep/remove R.class in static Java libraryYing Wang2012-06-193-10/+19
* | | | Merge "lint support."Ying Wang2012-06-194-0/+14
|\ \ \ \
| * | | | lint support.Ying Wang2012-06-184-0/+14
* | | | | Merge "Revert "Convert LOCAL_LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MOD...Ying Wang2012-06-181-9/+0
|\ \ \ \ \
| * | | | | Revert "Convert LOCAL_LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MODULES in...Ying Wang2012-06-181-9/+0
* | | | | | clean up pdk_config.mkKeun young Park2012-06-181-3/+4
* | | | | | am 51125621: am 43ca4a45: Remove the user tag and legacy prebuilts for the sr...Ying Wang2012-06-182-19/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | am 43ca4a45: Remove the user tag and legacy prebuilts for the srec modules.Ying Wang2012-06-182-19/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Remove the user tag and legacy prebuilts for the srec modules.Ying Wang2012-06-152-19/+0
* | | | | Merge "Make building an empty static library work."Torne (Richard Coles)2012-06-181-1/+3
|\ \ \ \ \