aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Lombok 0.2.3 for ADT pluginTor Norbye2015-01-072-2/+2
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I582a8900a2ca86a9cbfaccdb0dba2526b0bb2050
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am de589622: am 4881d024: Merge "Update ADT with ASM 5.0.3" into ↵Tor Norbye2014-12-216-16/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.1-dev automerge: 540d62b automerge: 9848807 * commit 'de5896221e60cf5936f35de5da5d000019a2f2ed': Update ADT with ASM 5.0.3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 4881d024: Merge "Update ADT with ASM 5.0.3" into studio-1.1-dev ↵Tor Norbye2014-12-216-16/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 540d62b automerge: 9848807 * commit '4881d024e3dbd28a03ebdee6ddd034a19e76b421': Update ADT with ASM 5.0.3
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update ADT with ASM 5.0.3" into studio-1.1-dev automerge: 540d62bTor Norbye2014-12-216-16/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 9848807 * commit '9848807e578747b1ba1db77e7620cd1d6454df3e': Update ADT with ASM 5.0.3
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update ADT with ASM 5.0.3" into studio-1.1-devTor Norbye2014-12-216-16/+16
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 540d62b * commit '540d62bd9ac07112fe2925233826272039e895ed': Update ADT with ASM 5.0.3
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update ADT with ASM 5.0.3" into studio-1.1-devTor Norbye2014-12-206-16/+16
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update ADT with ASM 5.0.3Tor Norbye2014-12-196-16/+16
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I03d846ce1bf9210ca8c35da9cf11a395fd950251
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 70df5a49: am 39e6ef76: Merge "find_java.bat now uses env var instead of ↵David Herman2014-12-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | find" into studio-1.0-dev automerge: 93eddd6 automerge: 028925b automerge: 1c82847 * commit '70df5a496d2378871348dc68d20c50026540fc9f': find_java.bat now uses env var instead of find
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 39e6ef76: Merge "find_java.bat now uses env var instead of find" into ↵David Herman2014-12-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.0-dev automerge: 93eddd6 automerge: 028925b automerge: 1c82847 * commit '39e6ef76aac947dc6e88aaac0f0ab441b00a3cdf': find_java.bat now uses env var instead of find
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "find_java.bat now uses env var instead of find" into studio-1.0-dev ↵David Herman2014-12-170-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 93eddd6 automerge: 028925b automerge: 1c82847 * commit '1c82847294ec4f2da3d31c10f3288216853c203c': find_java.bat now uses env var instead of find
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "find_java.bat now uses env var instead of find" into studio-1.0-dev ↵David Herman2014-12-170-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 93eddd6 automerge: 028925b * commit '028925bbfa330eee5d4b43e10b9f7f1c0fc6863f': find_java.bat now uses env var instead of find
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "find_java.bat now uses env var instead of find" into studio-1.0-devDavid Herman2014-12-170-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 93eddd6 * commit '93eddd6417c4be00b10ad63a0bc216c5a6839e50': find_java.bat now uses env var instead of find
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "find_java.bat now uses env var instead of find" into studio-1.0-devDavid Herman2014-12-151-3/+15
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | find_java.bat now uses env var instead of findDavid Herman2014-12-151-3/+15
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The officially recommended way to query an OS for its 32-bit/64-bit architecture can be found in this KB article: http://support.microsoft.com/kb/556009 Unfortunately, this fails for some subset of users for at least two reasons: 1) Many users install Unix tools on their Windows box, overwriting "find" with the Unix variant that doesn't support the \i parameter 2) Some machines are simply missing reg.exe. I've seen one claim in the wild that this was due to an agressive anti-virus scanner removing malware from their machine. Therefore, we now use absolute paths to the utilities we want to target. Additionally, we now have fallback handling if reg.exe is missing, where we, instead, rely on the %PROCESSOR_ARCHITECTURE% environment variable. Related issues: https://code.google.com/p/android/issues/detail?id=82099 https://code.google.com/p/android/issues/detail?id=82388 Change-Id: Icee0882fa6e1f5359c086498eb2679197cdf6f8e (cherry picked from commit f8796b4dce9202306dcd49afbdc9272f26845329)
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am bc9cb926: am ce906062: Merge "Minor improvements to systrace options ↵Siva Velusamy2014-12-171-24/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dialog" into studio-1.1-dev automerge: 4be655a automerge: e3dd6f7 * commit 'bc9cb92649178eb7d2b92ae59d9b3136d074ae54': Minor improvements to systrace options dialog
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am ce906062: Merge "Minor improvements to systrace options dialog" into ↵Siva Velusamy2014-12-171-24/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.1-dev automerge: 4be655a automerge: e3dd6f7 * commit 'ce906062c16f859f648bb8e43d79b358a87ade11': Minor improvements to systrace options dialog
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Minor improvements to systrace options dialog" into studio-1.1-dev ↵Siva Velusamy2014-12-171-24/+57
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 4be655a automerge: e3dd6f7 * commit 'e3dd6f783e9f5f1921003c5fd0aa920cb916937b': Minor improvements to systrace options dialog
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Minor improvements to systrace options dialog" into studio-1.1-devSiva Velusamy2014-12-171-24/+57
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 4be655a * commit '4be655acbb80d7084e7d17f15512a37f7c75acd6': Minor improvements to systrace options dialog
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Minor improvements to systrace options dialog" into studio-1.1-devSiva Velusamy2014-12-171-24/+57
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor improvements to systrace options dialogSiva Velusamy2014-12-161-24/+57
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL includes the following minor tweaks the systrace options dialog: - shows the default values to be used in a couple of text boxes - splits the list of tags into two sections: a commonly used set and a list of advanced tags Change-Id: I19b3033c099c181c2d801da262a899f6586da9fd
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 34b86f80: am 71134985: Merge "Update ADT & SDK Tools to 24.0.2" into ↵Tor Norbye2014-12-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.0-dev automerge: e99a450 automerge: 99a7828 automerge: d2d23e2 * commit '34b86f806934bf83b0c6f93b2855bfb17d967924': Update ADT & SDK Tools to 24.0.2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 71134985: Merge "Update ADT & SDK Tools to 24.0.2" into studio-1.0-dev ↵Tor Norbye2014-12-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: e99a450 automerge: 99a7828 automerge: d2d23e2 * commit '71134985707b65b54d8158d2ecbe8b2f4de7b756': Update ADT & SDK Tools to 24.0.2
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update ADT & SDK Tools to 24.0.2" into studio-1.0-dev automerge: ↵Tor Norbye2014-12-160-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e99a450 automerge: 99a7828 automerge: d2d23e2 * commit 'd2d23e2a813da747f2131d6339084853c6efe5a9': Update ADT & SDK Tools to 24.0.2
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update ADT & SDK Tools to 24.0.2" into studio-1.0-dev automerge: e99a450Tor Norbye2014-12-160-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 99a7828 * commit '99a78286d08b932d784b937fdf01ff6e99faec61': Update ADT & SDK Tools to 24.0.2
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update ADT & SDK Tools to 24.0.2" into studio-1.0-devTor Norbye2014-12-160-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: e99a450 * commit 'e99a450c2d1a25f890e2d991b365f9fae2ad48d7': Update ADT & SDK Tools to 24.0.2
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update ADT & SDK Tools to 24.0.2" into studio-1.0-devTor Norbye2014-12-1555-79/+79
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update ADT & SDK Tools to 24.0.2Tor Norbye2014-12-1555-79/+79
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idf12b9f222ad862bf5b8f0cc51b602eaf0924054 (cherry picked from commit cb6f9425cfb372faa64012b8377bcc44a69c3488)
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 786765ff: am 6f9ed107: Merge "Revert "82393: Fix template instantiation ↵Tor Norbye2014-12-164-169/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in ADT"" into studio-1.0-dev automerge: 1d5ab02 automerge: 72e0b00 automerge: 68e0d94 * commit '786765ffa3a384ebcfe1b4f088241db4c377a341': Revert "82393: Fix template instantiation in ADT"
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 6f9ed107: Merge "Revert "82393: Fix template instantiation in ADT"" into ↵Tor Norbye2014-12-164-169/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.0-dev automerge: 1d5ab02 automerge: 72e0b00 automerge: 68e0d94 * commit '6f9ed107e6beb9449bdd7ed48dc001951c2c9566': Revert "82393: Fix template instantiation in ADT"
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "82393: Fix template instantiation in ADT"" into ↵Tor Norbye2014-12-164-169/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.0-dev automerge: 1d5ab02 automerge: 72e0b00 automerge: 68e0d94 * commit '68e0d949865d96a24e124d1ffc588b3345fbbe65': Revert "82393: Fix template instantiation in ADT"
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "82393: Fix template instantiation in ADT"" into ↵Tor Norbye2014-12-164-169/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.0-dev automerge: 1d5ab02 automerge: 72e0b00 * commit '72e0b005d728686718cdb84347dc4cff5ef3c0ef': Revert "82393: Fix template instantiation in ADT"
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "82393: Fix template instantiation in ADT"" into studio-1.0-devTor Norbye2014-12-164-169/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 1d5ab02 * commit '1d5ab02a49d3a481b844ce8f75ae3e9aa6ac8eb9': Revert "82393: Fix template instantiation in ADT"
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "82393: Fix template instantiation in ADT"" into studio-1.0-devTor Norbye2014-12-154-169/+3
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "82393: Fix template instantiation in ADT"Tor Norbye2014-12-154-169/+3
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d7d481fa5e19353d1636f4df8b9bf875539bbc81. Rather than attempting to teach ADT to understand the new template formats, just continue to use the pre-24 templates instead (see https://android-review.googlesource.com/#/c/119386/ ) (cherry picked from commit c55e62658aaa2900759dd32e8f3e3b04b691d696) Change-Id: If7f6a4ae219581871cd979ae1aeeaf0d49ab7cce
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 652a586b: am c0065d0e: Merge "82393: Fix template instantiation in ADT" ↵Tor Norbye2014-12-164-3/+169
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into studio-1.0-dev automerge: 2d9dc8d automerge: 8784330 automerge: f015e9d * commit '652a586babfbfd1c605124eaf0987a241449bcbf': 82393: Fix template instantiation in ADT
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am c0065d0e: Merge "82393: Fix template instantiation in ADT" into ↵Tor Norbye2014-12-164-3/+169
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.0-dev automerge: 2d9dc8d automerge: 8784330 automerge: f015e9d * commit 'c0065d0e5051ef0e07a304d4ff5fc1eddda1fa3f': 82393: Fix template instantiation in ADT
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "82393: Fix template instantiation in ADT" into studio-1.0-dev ↵Tor Norbye2014-12-164-3/+169
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 2d9dc8d automerge: 8784330 automerge: f015e9d * commit 'f015e9d43c5fba427202785c5e6889be43d5bddd': 82393: Fix template instantiation in ADT
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "82393: Fix template instantiation in ADT" into studio-1.0-dev ↵Tor Norbye2014-12-164-3/+169
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 2d9dc8d automerge: 8784330 * commit '87843304b8742a17ccb080a1bd257014a03562d2': 82393: Fix template instantiation in ADT
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "82393: Fix template instantiation in ADT" into studio-1.0-devTor Norbye2014-12-164-3/+169
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 2d9dc8d * commit '2d9dc8d03d3565b0b74da540ba5b4457eff09584': 82393: Fix template instantiation in ADT
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "82393: Fix template instantiation in ADT" into studio-1.0-devTor Norbye2014-12-114-3/+169
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 82393: Fix template instantiation in ADTTor Norbye2014-12-114-3/+169
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First, implement a couple of new freemarker methods required by the templates. Second, switch the manifest merger over to the new Manifest merger. Change-Id: I26200d0a861ebddd4c4c92ebbba418ccb88fcb20 (cherry picked from commit d7d481fa5e19353d1636f4df8b9bf875539bbc81)
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am d5d2980e: am d6ed88d5: Merge "find_java.bat now uses env var instead of ↵David Herman2014-12-161-3/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | find" into studio-1.1-dev automerge: 4c54a65 automerge: 6b08eb6 * commit 'd5d2980e5aa98bd0e0f80e9871c19fa377e9a6dd': find_java.bat now uses env var instead of find
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am d6ed88d5: Merge "find_java.bat now uses env var instead of find" into ↵David Herman2014-12-161-3/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.1-dev automerge: 4c54a65 automerge: 6b08eb6 * commit 'd6ed88d5f882749e72c46079f80184f2704934bd': find_java.bat now uses env var instead of find
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "find_java.bat now uses env var instead of find" into studio-1.1-dev ↵David Herman2014-12-161-3/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 4c54a65 automerge: 6b08eb6 * commit '6b08eb63caef8ed6127eb25c03dc40078dd98d9d': find_java.bat now uses env var instead of find
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "find_java.bat now uses env var instead of find" into studio-1.1-devDavid Herman2014-12-161-3/+15
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 4c54a65 * commit '4c54a65ecb81849a7d18c7f88ffb15d216ff5655': find_java.bat now uses env var instead of find
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "find_java.bat now uses env var instead of find" into studio-1.1-devDavid Herman2014-12-151-3/+15
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | find_java.bat now uses env var instead of findDavid Herman2014-12-151-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The officially recommended way to query an OS for its 32-bit/64-bit architecture can be found in this KB article: http://support.microsoft.com/kb/556009 Unfortunately, this fails for some subset of users for at least two reasons: 1) Many users install Unix tools on their Windows box, overwriting "find" with the Unix variant that doesn't support the \i parameter 2) Some machines are simply missing reg.exe. I've seen one claim in the wild that this was due to an agressive anti-virus scanner removing malware from their machine. Therefore, we now use absolute paths to the utilities we want to target. Additionally, we now have fallback handling if reg.exe is missing, where we, instead, rely on the %PROCESSOR_ARCHITECTURE% environment variable. Related issues: https://code.google.com/p/android/issues/detail?id=82099 https://code.google.com/p/android/issues/detail?id=82388 Change-Id: Icee0882fa6e1f5359c086498eb2679197cdf6f8e
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am daa6255f: am 4413c67c: Merge "Update ADT & SDK Tools to 24.0.2" into ↵Tor Norbye2014-12-1655-79/+79
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.1-dev automerge: a72929e automerge: 2ef5b97 * commit 'daa6255f2f2ef39321e1a3da3a09b5d7013d4c6d': Update ADT & SDK Tools to 24.0.2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 4413c67c: Merge "Update ADT & SDK Tools to 24.0.2" into studio-1.1-dev ↵Tor Norbye2014-12-1655-79/+79
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: a72929e automerge: 2ef5b97 * commit '4413c67c3104742d619f870f9d5aa56eaf26e591': Update ADT & SDK Tools to 24.0.2
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update ADT & SDK Tools to 24.0.2" into studio-1.1-dev automerge: a72929eTor Norbye2014-12-1655-79/+79
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 2ef5b97 * commit '2ef5b970b8266ed4b328043ebb2c1a3e3f785c08': Update ADT & SDK Tools to 24.0.2
generated by cgit v1.1 at 2025-07-09 01:22:37 +0000