aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | Merge "Add support for build-tools in ADT."Xavier Ducrohet2013-03-2216-77/+273
| | |\ \ \ \ \ \
| | | * | | | | | Add support for build-tools in ADT.Xavier Ducrohet2013-03-2116-77/+273
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To be compatible with older projects, the projects do not have to declare which build-tools to use and instead use the lastest. Change-Id: Ic09a4a8f53109f36c4fed60b8f848f9b4db686c4
* | | | | | | | am a2dc08a8: (-s ours) am 1ea36a33: Switch to SDK Repository v8. DO NOT MERGE.Raphael Moll2013-03-210-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | | * commit 'a2dc08a8d8cf31a94b6dbfbfcc10b1a0ee0c65de': Switch to SDK Repository v8. DO NOT MERGE.
| * | | | | | am 1ea36a33: Switch to SDK Repository v8. DO NOT MERGE.Raphael Moll2013-03-211-0/+652
| |\ \ \ \ \ \ |/ / / / / / / | | | | _ / / | | | | / / | | | | | | * commit '1ea36a331bbee733a7b96f512dd79454a4a77496': Switch to SDK Repository v8. DO NOT MERGE.
| * | | | | Switch to SDK Repository v8. DO NOT MERGE.Raphael Moll2013-03-201-0/+652
| | |_|/ / | |/| | | | | | | | | | | | | Change-Id: I344cea9d06f0c975a4c2e2cb43a5454d5c941412
* | | | | Merge "Update ant's build.xml to support the build-tools SDK component."Xavier Ducrohet2013-03-212-11/+14
|\ \ \ \ \
| * | | | | Update ant's build.xml to support the build-tools SDK component.Xavier Ducrohet2013-03-202-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3c36dcb71dc36b930b33c74a959f2a5e43419905
* | | | | | Merge "Build ADT IDE only on Linux"Siva Velusamy2013-03-202-3/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Build ADT IDE only on LinuxSiva Velusamy2013-03-202-3/+6
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I832831093402bb6d4bfa4ab8aefd23d8d7ee8291
* | | | | Merge "52407: should add a newline at the end of autogenerated xml files"Tor Norbye2013-03-207-13/+58
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | 52407: should add a newline at the end of autogenerated xml filesTor Norbye2013-03-197-13/+58
|/ / / / | | | | | | | | | | | | Change-Id: Ia7a910e4426cf73f9ed25de9dfaf3df63cb88116
* | | | Merge "Build IDE script."Raphael Moll2013-03-192-5/+41
|\ \ \ \
| * | | | Build IDE script.Raphael Moll2013-03-152-5/+41
| | | | | | | | | | | | | | | | | | | | Change-Id: I99e6ae5ac952fe2f1295fd80a222373540a1cab2
* | | | | Merge "Fix dependencies of adt plugins to depend on the right prebuilts."Xavier Ducrohet2013-03-195-25/+25
|\ \ \ \ \
| * | | | | Fix dependencies of adt plugins to depend on the right prebuilts.Xavier Ducrohet2013-03-185-25/+25
|/ / / / / | | | | | | | | | | | | | | | Change-Id: Ibf8919eb96d9d026988bd2d97972e35aa0c9ae2f
* | | | | Merge "Add BouncyCastle to adt-base."Xavier Ducrohet2013-03-163-2/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add BouncyCastle to adt-base.Xavier Ducrohet2013-03-163-2/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | This is now needed by sdklib for signing. Change-Id: I804d8d2ca2d5a939c24e977ea48a2a5ad4fa7501
* | | | Merge "Rename project libraries."Raphael Moll2013-03-1512-52/+30
|\ \ \ \
| * | | | Rename project libraries.Raphael Moll2013-03-1512-52/+30
|/ / / / | | | | | | | | | | | | Change-Id: I324a5cb5c9c34ec4a8c2e4438bba8ebd56a693e6
* | | | Merge "Fix build."Ying Wang2013-03-143-7/+5
|\ \ \ \
| * | | | Fix build.Ying Wang2013-03-143-7/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | Now ddmlib is a prebuilt. Change-Id: Ic1bfb74c399a22c2a023f04aa2dc5c7ff4ae1b8d
* | | | Merge "Fix ADT test compile error."Raphael Moll2013-03-141-0/+7
|\ \ \ \
| * | | | Fix ADT test compile error.Raphael Moll2013-03-141-0/+7
|/ / / / | | | | | | | | | | | | Change-Id: Ib897ae33d2bb0797ad8da94abedcfa55e6a85787
* | | | Merge "SDK: Delete projects moved to tools/base or tools/swt."Raphael Moll2013-03-141362-120758/+0
|\ \ \ \
| * | | | SDK: Delete projects moved to tools/base or tools/swt.Raphael Moll2013-03-131362-120758/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Iba15f82cb00d19217382c78d8ff37dda1e97ea59
* | | | | Merge "Build SDK using prebuilts/devtools."Raphael Moll2013-03-148-100/+91
|\ \ \ \ \ | |/ / / /
| * | | | Build SDK using prebuilts/devtools.Raphael Moll2013-03-138-100/+91
|/ / / / | | | | | | | | | | | | Change-Id: I4c1979f8f07d24573b3ff7d7a1fa22d6ea87e5e3
* | | | Merge "53031 and 53032: XML formatting line separator fix"Tor Norbye2013-03-131-2/+13
|\ \ \ \
| * | | | 53031 and 53032: XML formatting line separator fixTor Norbye2013-03-131-2/+13
|/ / / / | | | | | | | | | | | | Change-Id: I62208c275eb13ec18e3c5f8078fd4aad524534df
* | | | Merge "Fix nullness annotation"Tor Norbye2013-03-131-1/+1
|\ \ \ \
| * | | | Fix nullness annotationTor Norbye2013-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Method which is marked @NonNull delegates to a different method in tools/base which is marked @Nullable. Change-Id: I45810dc805e5d638d2d03929ceb580f6d7ec58f9
* | | | | Merge "52887: Unable to format xml documents that begin with comments"Tor Norbye2013-03-131-0/+16
|\ \ \ \ \
| * | | | | 52887: Unable to format xml documents that begin with commentsTor Norbye2013-03-121-0/+16
|/ / / / / | | | | | | | | | | | | | | | Change-Id: Ia3bb2658474760de51b8af4d2f74d3c4771151c7
* | | | | Merge "Use the SDK common XmlPrettyPrinter"Tor Norbye2013-03-1327-1528/+400
|\ \ \ \ \
| * | | | | Use the SDK common XmlPrettyPrinterTor Norbye2013-03-1227-1528/+400
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The XML pretty printer was moved up from the Eclipse plugin into common (such that for example the resource merger can use it). This CL removes the old XML pretty printer and replaces it by a subclass which customizes the formatter slightly (in particular, taking advantage of the Eclipse DOM's ability to remember whether an XML tag was an empty tag such at <this/> rather than <this></this>.) Change-Id: Ie0865c3c35f1340fa4dcaf42253599f278ce4997
* | | | | Merge "Restore LOCAL_PATH in sdkmanager/app/Android.mk"Conley Owens2013-03-111-1/+3
|\ \ \ \ \
| * | | | | Restore LOCAL_PATH in sdkmanager/app/Android.mkConley Owens2013-03-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following line pollutes the value of LOCAL_PATH: include $(call all-makefiles-under,$(LOCAL_PATH)) Therefore, we need to keep around the original value of LOCAL_PATH so that we can restore it before calling find-all-java-files-under. Change-Id: I0e33a938e6259d4b37425040a9231991778acc84
* | | | | | Merge "SDK prebuilts: reorganize into tools/lib."Raphael Moll2013-03-0817-112/+112
|\ \ \ \ \ \
| * | | | | | SDK prebuilts: reorganize into tools/lib.Raphael Moll2013-03-0617-112/+112
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This must be submitted with prebuilts/devtools' change I3d985ed0abf. Change-Id: Icab479e0e8a5c126b0fdc213a792187a14a44f21
* | | | | | Merge "Delete duplicate files"Ying Wang2013-03-0810-3689/+0
|\ \ \ \ \ \
| * | | | | | Delete duplicate filesYing Wang2013-02-2810-3689/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These files are already in development/tools/emulator. Change-Id: I58988ce49804583b06e7d93380c44ba800448216
* | | | | | | Merge "Revert "Revert "Update ADT bundle to use Juno packages"""Siva Velusamy2013-03-071-3/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Revert "Revert "Update ADT bundle to use Juno packages""Siva Velusamy2013-03-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f95aa7710c5eeeb9a539372caacaf0fe111a9e82. The auto mergers are back on.
* | | | | | | Merge "Revert "Update ADT bundle to use Juno packages""Siva Velusamy2013-03-061-3/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Revert "Update ADT bundle to use Juno packages"Siva Velusamy2013-03-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6617e769cb453953ee83ec19ef744acdd3f22658. Auto merger isn't working, so eclipse-build-deps project isn't being synchronized.
* | | | | | | Merge "Update ADT bundle to use Juno packages"Siva Velusamy2013-03-051-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | Update ADT bundle to use Juno packagesSiva Velusamy2013-03-051-3/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Platform, JDT & Deltapack 4.2.2 Change-Id: I0163ee7b9cc0c46a6fc932af98a0693ff547cd4a
* | | | | Merge "9patch: Set default zoom level based on image size."Siva Velusamy2013-03-042-9/+62
|\ \ \ \ \
| * | | | | 9patch: Set default zoom level based on image size.Siva Velusamy2013-03-012-9/+62
|/ / / / / | | | | | | | | | | | | | | | Change-Id: Idfe3db88eb3c7493a4ccde0713ec925b4dfb8769
* | | | | Merge "New 'AppWidget' ADT Template."Roman Nurik2013-03-0177-0/+477
|\ \ \ \ \ | |/ / / / |/| | | |
generated by cgit v1.1 at 2025-10-16 23:12:09 +0000