summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge "Fix regex for finding symbol data."Christopher Ferris2013-12-121-2/+2
|\ \ \
| * | | Fix regex for finding symbol data.Christopher Ferris2013-12-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new output of debuggerd removed a space between the #00 and the rest of the line. The regex is very restrictive, so fixing it to handle the new output. Change-Id: I5259ae1e56a351608b330dfd858a2021e6d89358
* | | | Merge "Add an explicit definition of __ANDROID__=1"Ben Cheng2013-12-121-6/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Add an explicit definition of __ANDROID__=1Ben Cheng2013-12-121-6/+3
|/ / / | | | | | | | | | | | | | | | | | | Once the aarch64 toolchain is refreshed this will be removed. Also removed some CFLAG duplications. Change-Id: I42fd86931263af82042ea696196fb25e948fe9cb
* | | Merge "sign_target_files_apks: rewrite build.prop correctly in eng builds"Ying Wang2013-12-111-2/+3
|\ \ \ | |/ / |/| |
| * | sign_target_files_apks: rewrite build.prop correctly in eng buildsAndrew Boie2013-12-111-2/+3
|/ / | | | | | | | | | | | | | | | | In eng builds, ro.display.id has many space separated items and was resulting in an error when trying to rewrite it as 'value' gets turned into a list and never converted back to a string. Change-Id: I6c8633ed2eb52c56a4097992a32d53d80df4f844 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
* | Merge "Added TARGET_IS_64_BIT flag for x86_64 and aarch64"Ying Wang2013-12-112-0/+4
|\ \
| * | Added TARGET_IS_64_BIT flag for x86_64 and aarch64Alexey Volkov2013-12-112-0/+4
| | | | | | | | | | | | | | | Change-Id: Ibdf9dafa3aeaf4b58b4a559ed05e36e2793bf6ed Signed-off-by: Alexey Volkov <alexey.v.volkov@intel.com>
* | | Merge "Add "-encoding UTF-8" option to javadoc."Ying Wang2013-12-101-0/+2
|\ \ \
| * | | Add "-encoding UTF-8" option to javadoc.Ying Wang2013-12-101-0/+2
|/ / / | | | | | | | | | | | | This fixed docs build on Mac OS X 10.9 with Java 7. Change-Id: I91e224456c9e6c43dbf13d691c3b37d21f94b0f3
* | | am 948206c0: Merge "Fix tools path on Mac OS for java 7."Narayan Kamath2013-12-061-6/+10
|\ \ \ | | | | | | | | | | | | | | | | * commit '948206c026c8751b9d53341dfe9c2c2905ebb002': Fix tools path on Mac OS for java 7.
| * \ \ Merge "Fix tools path on Mac OS for java 7."Narayan Kamath2013-12-061-6/+10
| |\ \ \
| | * | | Fix tools path on Mac OS for java 7.Narayan Kamath2013-12-051-6/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: Ieb72b9e10771ee372bacf20258242cb006c29fef
* | | | | am fe57f665: Merge "A few more Java7 related clean ups."Narayan Kamath2013-12-062-18/+28
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'fe57f665074665edf469ad1e1d0fcef749f9a5bb': A few more Java7 related clean ups.
| * | | | Merge "A few more Java7 related clean ups."Narayan Kamath2013-12-062-18/+28
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | A few more Java7 related clean ups.Narayan Kamath2013-12-052-18/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Separate SDK checking from version checking and make messages clearer. - Add explicit source & target versions for javac to make things clearer. - Rename flag from EXPERIMENTAL_USE_JAVA7_OPENJDK to EXPERIMENTAL_USE_JAVA7. - Allow Oracle JDK 1.7 to be used on Mac OS, since there's no official OpenJDK support for that platform. Change-Id: I454d2c917ed78f03ec7559a99659fefe7e7d50f3
* | | | Merge commit 'd54f8c2d1b4d88db84465fee93aa29103ca32078' into HEADThe Android Open Source Project2013-12-0519-57/+212
|\ \ \ \ | |/ / / |/| | | | | | | Change-Id: I3cf53f083dee277a450dac36b011bc83180f6294
| * | | am 1611712d: am 221fcf31: Merge "Just a little .1 makes all the difference ↵Dianne Hackborn2013-11-142-1/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the world." into klp-dev * commit '1611712dac98d13e24ac6056405713d4994d25a5': Just a little .1 makes all the difference in the world.
| | * \ \ am 221fcf31: Merge "Just a little .1 makes all the difference in the world." ↵Dianne Hackborn2013-11-142-1/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '221fcf3183978d7ec6d482e09602312485f6652f': Just a little .1 makes all the difference in the world.
| | | * \ \ Merge "Just a little .1 makes all the difference in the world." into klp-devDianne Hackborn2013-11-142-1/+4
| | | |\ \ \
| | | | * | | Just a little .1 makes all the difference in the world.Dianne Hackborn2013-11-142-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4c4d8f507f9e81a632e22612043dc904694c5497
| * | | | | | am 2e6753a0: am de9b1835: Merge "Switch AOSP ARM build to use GCC 4.8."Ben Cheng2013-11-141-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2e6753a058a766d7c0607437224470c14574a94e': Switch AOSP ARM build to use GCC 4.8.
| * \ \ \ \ \ \ am 18b86b97: am 77f27f1d: Merge "Cleanup x86 and x86_64 flags"Ying Wang2013-11-133-41/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '18b86b97b83e7d254125723363f170bc6f8d391e': Cleanup x86 and x86_64 flags
| * \ \ \ \ \ \ \ am 9526eefb: am 4e5b39d8: style adjustment to design/dev/video buttonsScott Main2013-11-131-4/+5
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '9526eefbf30da333c003d7278d2977e70304a180': style adjustment to design/dev/video buttons
| | * | | | | | | am 4e5b39d8: style adjustment to design/dev/video buttonsScott Main2013-11-141-4/+5
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4e5b39d843548acaac73d1d1f729324805eda0a8': style adjustment to design/dev/video buttons
| | | * | | | | | | style adjustment to design/dev/video buttonsScott Main2013-11-131-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I97a147336805aeb340efcd12009794b02afab681
| * | | | | | | | | am 2c8415fb: am eebb7301: merge in release branch changes (no-op).Ed Heyl2013-11-130-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2c8415fb088dcc2adde6c666f979159552609bbc': "KOT43B" "KOT43" KOT42B "KOT42" "KOT41B" "KOT41" "KOT38D"
| | * | | | | | | | am eebb7301: merge in release branch changes (no-op).Ed Heyl2013-11-130-0/+0
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eebb7301b4de7c9767ef8794af34cd728bf78e06': "KOT43B" "KOT43" KOT42B "KOT42" "KOT41B" "KOT41" "KOT38D"
| | | * | | | | | | merge in release branch changes (no-op).Ed Heyl2013-11-130-0/+0
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | "KOT43B"The Android Automerger2013-11-121-3/+1
| | | | | | | | | | |
| | | | * | | | | | | merge in klp-mr1-release history after reset to klp-devThe Android Automerger2013-11-120-0/+0
| | | | |\ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | | * | | | | | | "KOT43"The Android Automerger2013-11-121-3/+1
| | | | | | | | | | |
| | | | * | | | | | | merge in klp-mr1-release history after reset to klp-devThe Android Automerger2013-11-120-0/+0
| | | | |\ \ \ \ \ \ \ | | | | | |_|_|_|/ / / | | | | |/| | | | | |
| | | | | * | | | | | KOT42BThe Android Automerger2013-11-111-1/+1
| | | | | | | | | | |
| | | | | * | | | | | "KOT42"The Android Automerger2013-11-111-3/+1
| | | | | | | | | | |
| | | | | * | | | | | merge in klp-mr1-release history after reset to klp-devThe Android Automerger2013-11-110-0/+0
| | | | | |\ \ \ \ \ \ | | | | |/ / / / / / /
| | | | | * | | | | | "KOT41B"The Android Automerger2013-11-101-1/+1
| | | | | | | | | | |
| | | | | * | | | | | "KOT41"The Android Automerger2013-11-101-3/+1
| | | | | | | | | | |
| | | | | * | | | | | merge in klp-mr1-release history after reset to klp-devThe Android Automerger2013-11-100-0/+0
| | | | | |\ \ \ \ \ \ | | | | |/ / / / / / /
| | | | | * | | | | | "KOT38D"The Android Automerger2013-11-081-1/+1
| | | | | | | | | | |
| * | | | | | | | | | am dcc645eb: am dd00a967: Merge "Revert the revert. (its time to sign MR1)" ↵Baligh Uddin2013-11-123-17/+53
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit 'dcc645ebb1a87982d2a067b8584ff167ae2c5287': Revert the revert. (its time to sign MR1)
| | * | | | | | | | | am dd00a967: Merge "Revert the revert. (its time to sign MR1)" into klp-devBaligh Uddin2013-11-123-17/+53
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dd00a9677b21d2dbdef6b085570e1358f172de80': Revert the revert. (its time to sign MR1)
| | | * | | | | | | | Merge "Revert the revert. (its time to sign MR1)" into klp-devBaligh Uddin2013-11-133-17/+53
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | Revert the revert. (its time to sign MR1)Baligh Uddin2013-11-133-17/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Waiting till post MR0 - this impacts signing tools for MR0." This reverts commit a7b5c4a7dc77a0896d6314828b9ce85f82d103e8. Bug: 11334314 Change-Id: I89f8996161e4258b80bf2d0bc7817f0e8e32df13
| * | | | | | | | | | am 680821ed: am 13cd8f15: add style for video button in docsScott Main2013-11-125-0/+25
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '680821ed27a2a2dfce7298434307065aa5ed56aa': add style for video button in docs
| | * | | | | | | | | am 13cd8f15: add style for video button in docsScott Main2013-11-125-0/+25
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '13cd8f15476ec66145b3685ca5ce181491fe28c0': add style for video button in docs
| | | * | | | | | | | add style for video button in docsScott Main2013-11-125-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2f2dcf80aef9c55ad6a11f13549b8dd8709cbc84
| * | | | | | | | | | am faff9f52: am 641c2c2f: clarify the hidden APIs in reference with better ↵Scott Main2013-11-122-3/+5
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tooltips * commit 'faff9f52c1882d4a2eadce90bf90b0fbd7082632': clarify the hidden APIs in reference with better tooltips
| | * | | | | | | | | am 641c2c2f: clarify the hidden APIs in reference with better tooltipsScott Main2013-11-122-3/+5
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '641c2c2fdaf68fa48b044177fef7c890a42c8a11': clarify the hidden APIs in reference with better tooltips
| | | * | | | | | | | clarify the hidden APIs in reference with better tooltipsScott Main2013-10-312-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaa843b4a0462195084fb7a35e826eeec92d50c64