summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am a6a2969e: Resolved conflicts for merge of 05a7a955 to klp-modular-dev-plus...Xavier Ducrohet2014-05-091-19/+1
|\
| * Resolved conflicts for merge of 05a7a955 to klp-modular-dev-plus-aospXavier Ducrohet2014-05-081-19/+1
| |\
| | * am afe444a5: Merge "Remove SDK Tools from platform builds."Xavier Ducrohet2014-05-091-19/+1
| | |\
| | | * Merge "Remove SDK Tools from platform builds."Xavier Ducrohet2014-05-091-19/+1
| | | |\
| | | | * Remove SDK Tools from platform builds.Xavier Ducrohet2014-05-081-19/+1
| * | | | am d6214b31: am 0d4b3df6: Merge "Target "tests" now only builds the modules t...Ying Wang2014-05-093-59/+14
| |\ \ \ \ | | |/ / /
| | * | | am 0d4b3df6: Merge "Target "tests" now only builds the modules tagged as "tes...Ying Wang2014-05-093-59/+14
| | |\ \ \ | | | |/ /
| | | * | Target "tests" now only builds the modules tagged as "tests"Ying Wang2014-05-083-59/+14
| * | | | am 2d41656c: am f6603f75: Merge "Add tool to package up built modules."Ying Wang2014-05-093-0/+50
| |\ \ \ \ | | |/ / /
| | * | | am f6603f75: Merge "Add tool to package up built modules."Ying Wang2014-05-093-0/+50
| | |\ \ \ | | | |/ /
| | | * | Add tool to package up built modules.Ying Wang2014-05-083-0/+50
* | | | | Merge "Add verity support to `make dist`."Geremy Condra2014-05-092-6/+8
|\ \ \ \ \
| * | | | | Add verity support to `make dist`.Geremy Condra2014-05-062-6/+8
* | | | | | Merge "Target "tests" now only builds the modules tagged as "tests""Ying Wang2014-05-083-59/+14
|\ \ \ \ \ \
| * | | | | | Target "tests" now only builds the modules tagged as "tests"Ying Wang2014-05-083-59/+14
* | | | | | | am 676c8f04: am 4ed19f0f: am 1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for...Brian Carlstrom2014-05-081-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | am 4ed19f0f: am 1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for eng build"Brian Carlstrom2014-05-081-0/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am 1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for eng build"Brian Carlstrom2014-05-081-0/+4
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge "Add dalvik.vm.dex2oat-flags for eng build"Brian Carlstrom2014-05-081-0/+4
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Add dalvik.vm.dex2oat-flags for eng buildBrian Carlstrom2014-05-061-0/+4
* | | | | | am af93afce: am 0a61a603: am 3b15cdb8: Merge "Apply LOCAL_LDLIBS to target bu...Ying Wang2014-05-086-12/+24
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 0a61a603: am 3b15cdb8: Merge "Apply LOCAL_LDLIBS to target build rules too."Ying Wang2014-05-086-12/+24
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 3b15cdb8: Merge "Apply LOCAL_LDLIBS to target build rules too."Ying Wang2014-05-086-12/+24
| | |\ \ \ \ | | | |/ / /
| | | * | | Apply LOCAL_LDLIBS to target build rules too.Ying Wang2014-05-076-12/+24
| | | |/ /
* | | | | Merge "Add tool to package up built modules."Ying Wang2014-05-073-0/+50
|\ \ \ \ \
| * | | | | Add tool to package up built modules.Ying Wang2014-05-053-0/+50
* | | | | | Merge "Automatically export generated .pb.h files."Ying Wang2014-05-061-1/+5
|\ \ \ \ \ \
| * | | | | | Automatically export generated .pb.h files.Ying Wang2014-05-061-1/+5
* | | | | | | am ccd6223f: am ba0bb801: am a16583a0: Merge "Fix windows/mingw build."Ying Wang2014-05-061-1/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am ba0bb801: am a16583a0: Merge "Fix windows/mingw build."Ying Wang2014-05-061-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | am a16583a0: Merge "Fix windows/mingw build."Ying Wang2014-05-061-1/+1
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Fix windows/mingw build.Ying Wang2014-05-061-1/+1
* | | | | | | am bf4cdb49: am c3b2314a: am a37550ed: Merge "Use prebuilt flex."Ying Wang2014-05-061-3/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
| * | | | | am c3b2314a: am a37550ed: Merge "Use prebuilt flex."Ying Wang2014-05-061-3/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | am a37550ed: Merge "Use prebuilt flex."Ying Wang2014-05-061-3/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Use prebuilt flex."Ying Wang2014-05-061-3/+1
| | | |\ \ \
| | | | * | | Use prebuilt flex.Ying Wang2014-05-051-3/+1
* | | | | | | am 9c7393b8: am e9dd544d: am 889a93a4: Merge "add silvermont x86 architecture"Ying Wang2014-05-062-0/+37
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | am e9dd544d: am 889a93a4: Merge "add silvermont x86 architecture"Ying Wang2014-05-062-0/+37
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 889a93a4: Merge "add silvermont x86 architecture"Ying Wang2014-05-062-0/+37
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "add silvermont x86 architecture"Ying Wang2014-05-062-0/+37
| | | |\ \ \
| | | | * | | add silvermont x86 architectureAndrew Boie2014-04-302-0/+37
* | | | | | | Merge "Add libmediandk"Marco Nelissen2014-05-051-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Add libmediandkMarco Nelissen2014-04-211-0/+1
* | | | | | | | am 6f916664: am 735628e8: am 2ff8919d: Merge changes I7e809264,I504cea21,Ibd2...Colin Cross2014-05-053-16/+31
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | am 735628e8: am 2ff8919d: Merge changes I7e809264,I504cea21,Ibd2165e6Colin Cross2014-05-053-16/+31
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | am 2ff8919d: Merge changes I7e809264,I504cea21,Ibd2165e6Colin Cross2014-05-053-16/+31
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge changes I7e809264,I504cea21,Ibd2165e6Colin Cross2014-05-053-16/+31
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | | * | | build: reverse abi list when TARGET_PREFER_32_BIT_APPS is setColin Cross2014-05-011-10/+20
| | | | * | | build: split TARGET_PREFER_32_BIT for apps and executablesColin Cross2014-04-303-6/+11