aboutsummaryrefslogtreecommitdiffstats
path: root/files
Commit message (Collapse)AuthorAgeFilesLines
* Add min-platform-tools-rev to the tools source.propertiesRaphael Moll2011-02-231-0/+1
| | | | | | | We need that info to generate the repository.xml since it's a mandatory attribute in the XSD. Change-Id: Ic341687f07f8d91182d680cd1d3b35e431c38670
* Move tools and ADT version to 11.Xavier Ducrohet2011-02-101-1/+1
| | | | Change-Id: I4ba19e12a7d11df3d3c1053c30f3998a93b5fb06
* Ant tasks and dependency clean up.Xavier Ducrohet2011-02-081-0/+14
| | | | | | | | | | | Give anttasks.jar a proper manifest with jar dependencies. Update the manifest of sdklib.jar with the common.jar dependency. The pre-setup section of build.xml has changed over time and really we should be able to control it so move it in $SDK/tools/ant/pre_setup.xml and import it into build.xml Change-Id: Iab707deccc0cdbe8d1a9db052ee6fb0762853394
* Tools r10 require ADT 10.0Xavier Ducrohet2011-02-071-1/+1
| | | | Change-Id: Ide739f4e3edddb3ab04519262eee34d28e18bd16
* Add renderscript support to the Ant build system.Xavier Ducrohet2011-01-181-2/+25
| | | | Change-Id: Iba1c956d33725716923da89b788f7f8d14524e41
* Merge "Parse the manifest min/targetSdkVersion to configure the layoutlib."Xavier Ducrohet2011-01-181-4/+4
|\
| * Parse the manifest min/targetSdkVersion to configure the layoutlib.Xavier Ducrohet2011-01-181-4/+4
| | | | | | | | | | | | | | | | This is needed to configure ApplicationInfo in the layoutlib so that some widgets properly apply different behaviors based on the app targetSdkVersion. Change-Id: Ic78af4390d1b871469583f3efc0de3a9da718a6c
* | Move SDK Tools and ADT version to 10.Xavier Ducrohet2011-01-181-1/+1
|/ | | | Change-Id: I6cfde67f2d0a0da2f94124d19e152e99df349820
* Don't reopen a layout if it's already opened.Xavier Ducrohet2011-01-111-3/+3
| | | | | | | | | | This is for the case where a layout is opened and Eclipse tell its editor to re-open it because it was double clicked again in the package explorer due to the MatchingStrategy having returned true. Change-Id: I404494b990215bcdff163a382ecb411e2efb9b51 Misc: reorder configs for the WXGA device config.
* This is tools r9 in tools_r9. DO NOT MERGE.Xavier Ducrohet2011-01-111-1/+1
| | | | Change-Id: I4d6d8cd74abd2cb3b9087ac4f30b761d803e15e3
* Fix layout device list.Xavier Ducrohet2011-01-071-1/+1
| | | | Change-Id: Idb6b0f654cd11225faceeb5b0541703623a0ee83
* merge from open-source masterThe Android Open Source Project2010-12-281-0/+10
|\ | | | | | | Change-Id: I31f069bc3e50c895162d15b4d0d5851a4d380fda
| * Add readme regarding move of adb to platform-toolsRaphael Moll2010-12-231-0/+10
| | | | | | | | Change-Id: I861a1b02a3abb1bb1f9120bbd25f3d4ffd949e9e
* | merge from open-source masterThe Android Open Source Project2010-12-131-1/+1
|\ \ | |/ | | | | Change-Id: I9036a5154f006f1f6ba6685b9b8985db07a66ed0
| * Move to rev 10 and update change logXavier Ducrohet2010-12-131-1/+1
| | | | | | | | Change-Id: I477033c03a40c52d26b73efa892a65feafaba680
* | merge from open-source masterThe Android Open Source Project2010-12-091-1/+1
|\ \ | |/ | | | | Change-Id: I377761c7b5568f9e66331540b8db82f08a09c1eb
| * android.el: Make android-uninstall-app not reinstallRichard Lowe2010-12-091-1/+1
| | | | | | | | | | | | | | - uninstall, rather than reinstalling the app - Fix reference to argument Change-Id: I66afe170c1d0ce2e5acfccf7a0c635fd07764f32
* | merge from open-source masterThe Android Open Source Project2010-12-062-2/+9
|\ \ | |/ | | | | Change-Id: I5a05ec6c6dca06af72779d6c4d66efcaba8abd10
| * Fix ant rulesXavier Ducrohet2010-12-062-2/+9
| | | | | | | | | | | | | | - utf-8 is default encoding for java files. - make encoding, target, source also overridable in the lib rules. Change-Id: I95a6dfd2a815ea9994638c0a0270381819b75a12
* | merge from open-source masterThe Android Open Source Project2010-11-151-0/+1
|\ \ | |/ | | | | Change-Id: I717ec549d6917bc238a3517c091cfcca0609ef8c
| * Add preferences to the list of not proguarded classes.Xavier Ducrohet2010-11-151-0/+1
| | | | | | | | Change-Id: Ib7db435bb640b3a3feaa0534ccc77b6f9eda0800
* | merge from open-source masterThe Android Open Source Project2010-11-151-0/+1
|\ \ | |/ | | | | Change-Id: Ife73a3a44823869ddc2536650aa8f68bbb1f5f45
| * Exclude BackupAgentHelper classes from Proguard.Raphael Moll2010-11-151-0/+1
| | | | | | | | | | | | | | | | | | To use the Backup API in Froyo, an app needs to typically extend this helper class and the class is only referenced from the AndroidManifest.xml, so ideally we should exclude such classes from Proguard by default. Change-Id: I690220d2e89a8ff6d0664be93dad55da8b7b66c2
* | merge from open-source masterThe Android Open Source Project2010-10-272-6/+2
|\ \ | |/ | | | | Change-Id: I8115fa4f83035d6a5aa59bcb0a5603f38f99a59b
| * Fix adb location in ant rules.Xavier Ducrohet2010-10-272-6/+2
| | | | | | | | Change-Id: Ia8188de0b8af0ec4474f5c4ca2cec294c077e03f
* | merge from open-source masterThe Android Open Source Project2010-10-263-0/+51
|\ \ | |/ | | | | Change-Id: I51c83c375936259d6ebe3efabd77eb1f46805236
| * SDK: Fixed proguard.bat & co.Raphael Moll2010-10-263-0/+51
| | | | | | | | | | | | | | | | | | These are similar to the external/proguard/bin/*.bat except they use $SDK/tools/lib/find_java.bat to locate the java location and use it if available. find_java will print a proeminent error if java cannot be found. Change-Id: I1fceae838436053031f405de9b3f1ab2d64222e6
* | merge from open-source masterThe Android Open Source Project2010-10-251-3/+23
|\ \ | |/ | | | | Change-Id: Ia61cea62f72a18aea3d908c90c90af9a517ed659
| * Fix external jar support when building with proguard.Xavier Ducrohet2010-10-251-3/+23
| | | | | | | | Change-Id: I3dafb284770f475d70a212cbe22cdae6bff36ff7
* | merge from open-source masterThe Android Open Source Project2010-10-111-1/+1
|\ \ | |/ | | | | Change-Id: I1e69603b2d46eb071822dc7fac667bb02649e15a
| * Merge "Display SDK/plug-in incompatibility messages."Xavier Ducrohet2010-10-111-1/+1
| |\
| | * Display SDK/plug-in incompatibility messages.Xavier Ducrohet2010-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | Hmm this used to work. But the lines displaying the error messages are gone... Change-Id: I83cf7d3e8a471fe6b2166818db9fad4f60d3d392
* | | merge from open-source masterThe Android Open Source Project2010-10-081-0/+34
|\ \ \ | |/ / | | | | | | Change-Id: I512ca46b9579f24774b1a56f8d5531a150d090b6
| * | Proguard default config file.Xavier Ducrohet2010-10-081-0/+34
| |/ | | | | | | | | | | | | | | It is located in $SDK/tools/lib/proguard.cfg and automatically put in Ant project (create and update if project is not already setup for proguard). Change-Id: I9bcb2a5aafec1329b0c001799f4ba34c61569c3a
* | merge from open-source masterThe Android Open Source Project2010-10-011-12/+36
|\ \ | |/ | | | | Change-Id: Ic53d217bf6b2008bb394f31aac8441a99e449201
| * In some cases release build is actually a debug build.Xavier Ducrohet2010-09-291-12/+36
| | | | | | | | | | | | | | If the manifest sets debuggable=true then this override the release build to be a debug build instead. Change-Id: Ib66bf9053cecfa7c19a02cefdbf187a20bd6da37
* | merge from open-source masterThe Android Open Source Project2010-09-271-0/+17
|\ \ | |/ | | | | Change-Id: I042d0153b76bd8b164a815165f80d29b4ed94df2
| * Ant doc on how to replace proguard.Xavier Ducrohet2010-09-271-0/+17
| | | | | | | | Change-Id: I27faad2282fbe6cff565d945c2b64d42d31db1fe
* | merge from open-source masterThe Android Open Source Project2010-09-241-31/+96
|\ \ | |/ | | | | Change-Id: Ie20ef0aec822d00c70e9bb1764002cd624b4ae38
| * Make it easier to use a different obfuscator.Xavier Ducrohet2010-09-241-37/+34
| | | | | | | | Change-Id: I3fb80a8b91482de5117a9e093b2d50010bb99546
| * Use proguard for release builds through Ant.Xavier Ducrohet2010-09-241-16/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is only activated if default.properties contains a property "proguard.config" with the name of a proguard config file. Some clean-up in the Ant tasks and in the name of the properties used by the rules and the custom tasks to make them clearer. Added a new test app with a project using a jar file as well as a library using a jar file. Change-Id: Ia8f4d873025993d454c0a484e61d47ae679ea79c
* | merge from open-source masterThe Android Open Source Project2010-09-241-1/+8
|\ \ | |/ | | | | Change-Id: If12bf352bc918d9f874e619bb5b3053c755c9699
| * Make javac ant options configurable.Xavier Ducrohet2010-09-241-1/+8
| | | | | | | | Change-Id: I303acdb4fc8de6ba5d8de7c18e020e97fe01e3de
* | merge from open-source masterThe Android Open Source Project2010-09-101-1/+1
|\ \ | |/ | | | | Change-Id: I7f8d4353f2905aa5de511e61f4d0f13e0bc4ddc6
| * Fix test ant rules.Xavier Ducrohet2010-09-101-1/+1
| | | | | | | | | | | | They were importing the old name of the main rules. Change-Id: If5d591d48f420e5bd8a24843c99befdbb487cd80
* | merge from open-source masterThe Android Open Source Project2010-09-029-1275/+22
|\ \ | |/ | | | | Change-Id: I75d0a0bb0dc46dc1823d5fc2ca609d3a26a5f91b
| * Support for debug build in Ant.Xavier Ducrohet2010-09-029-1275/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | "ant debug" now automatically insert debuggable=true in the manifest. Also cleaned up a lot of the Ant stuff (versioned Ant rules, support for importing different rules files based on compatibility computation). This is rendered moot with our new single aapt executable. The ant rules will now evolve alongside aapt, and there will not be mismatch between the two. Change-Id: Iaf309f40e6ab4a0204dfbdb428cfb569bf5ca3b3
* | merge from open-source masterThe Android Open Source Project2010-08-311-1/+5
|\ \ | |/ | | | | Change-Id: Id6d2e8d96b34ecbdd611c7eb19d0bb62655f888a
| * resolve conflict from tools_r7Jean-Baptiste Queru2010-08-311-1/+5
| |\ | | | | | | | | | Change-Id: I5f416c6e77def15fdc6ae1022bbfe3033a6992ef
| | * Add Ant property when in release mode.Xavier Ducrohet2010-08-271-1/+5
| | | | | | | | | | | | | | | | | | Also fix some NPE in usage of ISdkLog.warning Change-Id: Id2803f7692b82d0d2f5dea49f17f916509a7b205