aboutsummaryrefslogtreecommitdiffstats
path: root/files
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
| | * Merge "SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"" into tools_r7Xavier Ducrohet2010-08-231-3/+9
| | |\
| | | * SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"Raphael Moll2010-08-231-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | Merged from master to tools_r7 Change-Id: Ib8e702344dd2d593d7f7e6d56b0c3534480ff376
| | * | Improve capability of the post-compile target.Xavier Ducrohet2010-08-231-1/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the dex target use a different property to read the input folder for classes to dexify. By default the new property has the same value but can be overriden if a post-compile target modify (obfuscate) code into a different location. Merged from master into tools_r7 Change-Id: I1fe2fd2a2678d8c4354702250cea1481f74dd7cf
| | * Android.bat support for Java 64-bit.Raphael Moll2010-08-231-8/+16
| | | | | | | | | | | | | | | | | | | | | android.bat: properly encode file using CRLF (not Unix mode). find_java.bat: properly check for Java in the 64-bit ProgramFiles path. Change-Id: If4a106f144b5b890a62fc5543b35df85ab5ab06c
* | | merge from open-source masterThe Android Open Source Project2010-08-231-1/+2
|\ \ \ | |/ / | | | | | | Change-Id: Ia55cfd4c49a26447d06124b4505eeff73e5998e1
| * | Merge "Improve capability of the post-compile target."Xavier Ducrohet2010-08-231-1/+2
| |\ \
| | * | Improve capability of the post-compile target.Xavier Ducrohet2010-08-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the dex target use a different property to read the input folder for classes to dexify. By default the new property has the same value but can be overriden if a post-compile target modify (obfuscate) code into a different location. Change-Id: I9caeca9f342c7ead1dcee9b4d80cde4ad741a843
* | | | merge from open-source masterThe Android Open Source Project2010-08-231-3/+9
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Iaf2f7de891f78af2eddd7a5edc6e8d5bcc4e0b48
| * | | Merge "SDK: Rename "SDK Setup.exe" to "SDK Manager.exe""Raphael Moll2010-08-231-3/+9
| |\ \ \ | | |/ / | |/| |
| | * | SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"Raphael Moll2010-08-231-3/+9
| | | | | | | | | | | | | | | | Change-Id: Id62b59e75e92fe14376353211dd59d89f4ee63c6
* | | | merge from open-source masterThe Android Open Source Project2010-08-231-8/+16
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I01a81355942ab0a11c257fd4ffa11b6db2e71e8e
| * | | Android.bat support for Java 64-bit.Raphael Moll2010-08-211-8/+16
| |/ / | | | | | | | | | | | | | | | | | | android.bat: properly encode file using CRLF (not Unix mode). find_java.bat: properly check for Java in the 64-bit ProgramFiles path. Change-Id: I78adb4783955cfad867d29f66d7ee58a017d41c4
* | | ADT: support xlarge resource configuration.Raphael2010-08-111-0/+27
|/ / | | | | | | | | | | Also added a sample device configuration for the layout editor. Change-Id: I1ec540038d2676e1f924e74f7f2aa8000d3672b3
* | Move tools to r8 in the dev branch.Xavier Ducrohet2010-07-221-1/+1
|/ | | | Change-Id: I703a4a52c0f2e76c5b19103f3b43ef203472006c
* Add new default devices to the layout editor.Xavier Ducrohet2010-07-091-3/+203
| | | | | | | | | Those devices represent one of each res/density combo for officially supported screens. See http://developer.android.com/guide/practices/screens_support.html#range Change-Id: I6b8348ae1ab96b6b1f27fa2afd655ff6f3866dd8
* Ant support for library depending on other libraries.Xavier Ducrohet2010-06-291-2/+10
| | | | Change-Id: Ief8261327f7917d158fc8ad4dd4e4c3d322bbce2
* Support for aidl files in library project in the Ant build system.Xavier Ducrohet2010-06-282-18/+54
| | | | Change-Id: I3e36e6f4db60d3d979b24c2b88d496f453394127
* Add support for Dock, Night mode, and Navigation state resource qualifiers.Xavier Ducrohet2010-06-221-0/+3
| | | | Change-Id: I6b84248354c48accaed4baab7d9c12d8757a335b
* Add support for adb.device.arg to the test Ant rules.Xavier Ducrohet2010-05-281-0/+2
| | | | Change-Id: Idfc39bcdd79f17700952bb66ed1b67a840495011
* Override local keystore/alias info when using export project to export.Xavier Ducrohet2010-05-071-0/+1
| | | | Change-Id: If4f188591b8c5154be894fdd1872a182d1b6eadc
* Add support for code-less project.Xavier Ducrohet2010-05-061-50/+90
| | | | Change-Id: I09e8e5b40df3b8da4b34fe4f000e98263ea5bc55
* Move all Ant rules under sdk/files/antXavier Ducrohet2010-05-058-0/+0
| | | | Change-Id: I7533b52a56c00502dce8798bf31ac50444543446
* Add support for signing in the multi-apk ant build.Xavier Ducrohet2010-05-051-19/+31
| | | | Change-Id: I0b0223b7fa5275995563a1a21192941bd72811cc
* New If/Then/Else custom Ant rules to simplify some Ant rules logic.Xavier Ducrohet2010-05-041-4/+13
| | | | | | | Also cleaned up some attribute of our other custom tasks to conform to the standard convention (all lower case, all those were new in r3) Change-Id: If328a8eb2448d95bee1f1b70928d72fde5014eeb
* Fix displayed message in some ant targets.Xavier Ducrohet2010-05-041-4/+4
| | | | | | Ouput properties were renamed from *.package to *.file Change-Id: Id6885951f630a0507df0d68298778cd4cc64a4ad
* Fix the Ant test rules r3Xavier Ducrohet2010-05-041-438/+79
| | | | | | They were created from the wrong r2 file. Change-Id: I62dc6c631cc7c1fdac6dd7ba57a776bb576e3c1f
* First step of multiple apk support.Xavier Ducrohet2010-05-032-42/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - New export type project to handle exporting a single app represented by multiple projects (for different minSdkVersion for instance). - Cleaned-up the current Ant tasks and Eclipse builder to not deal with ApkSettings anymore. It's not possible to generate more than one APK in a single pass. The export project will handle this and call out the normal build system to export each variant. Make older (deprecated) attribute actually output a warning. - Ant rules r3 now with support for multi apk export. Lots of clean up, add new properties to be overriden by the multi-apk export task, make older one overrideable too. - Better handling of older rules, older tasks, etc... in the SetupTask used by the normal build. - Add split by ABI to ApkSettings and use it in the new multi apk export. - New custom task for multi-apk export. Replaces SetupTask for export-type projects. Calls out to the project's build.xml after setting/overriding properties. This also override the project's versionCode with a new composite one made of different values. Also uses a different build.xml, so added a new template: build.export.template. Very much a work in progress. Still to do: Add other types of APK split, create/update export projects, export the build log, ... Also, we need to refactor the normal build rules to avoid so much duplication! Change-Id: I57a565c60d097a5eabb40108ae1fa8cb209f2380
* Ant: Add customizable targets between the default ones.Xavier Ducrohet2010-04-281-4/+16
| | | | Change-Id: I5f187584afb91814ccba4e984c4c45c24557aaae
* Add ABI filtering and version code injection in the Ant rules and tasks.Xavier Ducrohet2010-04-271-0/+8
| | | | Change-Id: Ic8e41c1ad5343b32d2766427ba271a79c88b3b66
* Add rev 3 of the ant rules.Xavier Ducrohet2010-04-274-1/+1062
| | | | | | | For now they are the same as the r2. Also modified SetupTask to deal better with older tools. Change-Id: I22ff809ace3ff81fb6852a707165165a9b4ec88a
* merge from tools-r6The Android Open Source Project2010-04-083-1/+11
|\ | | | | | | Change-Id: If11d893ba56c1189620e00f86b7f51bf4d698e49
| * Fix Ant test rules.Xavier Ducrohet2010-04-023-1/+11
| | | | | | | | | | | | | | | | - Fix import of the main rules since we changed the name! - Added main project libraries to the classpath of the test project. Bug: 2568115 Change-Id: I8803b84a179c6301736d7e2558e06a1734eef650
* | move to Tools r7 and ADT 0.9.8Xavier Ducrohet2010-04-011-1/+1
|/ | | | Change-Id: Ia7690ff2787aa68bb668af05bbaf13a7cf16bc8b
* Put back the old Ant rules and put the new ones under new names.Xavier Ducrohet2010-03-185-0/+551
| | | | Change-Id: Ie6c99be890ac78ba578234be0c145147fc6afa5e
* Remove aidl step from library ant rulesXavier Ducrohet2010-03-111-14/+1
| | | | | | aidl is not supported by libraries. Change-Id: Id37d71ac2f1f48776bf9bff72e2a3099a1511c64
* Move ant.prop to sdk.prop and up a folder.Xavier Ducrohet2010-03-112-3/+4
| | | | | | | | | | | | | | | | this file is meant to have general sdk properties, not just Ant ones. Also separated the library support from the Ant build version. It's clearer whether or not libraries are supported, and it's not just tied to Ant anyway (ADT needs to know as well). Finally use that new property to do checks on library support in both the custom Ant tasks and ADT. Depends on a CL in development.git (sdk.atree change). Change-Id: I77d229ed3fd60f0468b1d3d31f7cf147b03a32fb
* Merge remote branch 'goog/master' into HEADXavier Ducrohet2010-02-231-6/+8
|\
| * Only add gdbserver to the APK if the manifest has debuggable to true.Xavier Ducrohet2010-02-231-6/+8
| | | | | | | | Change-Id: I2411f59f46cdda2e12b1627d450cde6c9cd109d8
| * Change the property names to something better.Xavier Ducrohet2010-02-161-2/+2
| | | | | | | | | | | | | | Once added to the rest of the properties, "revision.*" is a bit to vague. Change-Id: I386780f3bd3b39ef6ea49d1c8d3c717cb263b6a1
* | Change the property names to something better.Xavier Ducrohet2010-02-171-2/+2
| | | | | | | | | | | | | | Once added to the rest of the properties, "revision.*" is a bit to vague. Change-Id: Ifaca600ac3a5c6de35aa6bd1465a0a3fc2ccde52
* | Merge remote branch 'goog/master' into HEADXavier Ducrohet2010-02-161-0/+3
|\ \ | |/
| * Add Ant build/template revision to the SDK platforms.Xavier Ducrohet2010-02-161-0/+3
| | | | | | | | Change-Id: I1cd3964707c5472851c6868796649e62b4f2d232
* | Add support for external jar files in library project.Xavier Ducrohet2010-02-101-2/+6
| | | | | | | | | | Bug: 2294012 Change-Id: I88bc99d9c3ac4135aac4c5af7995aca25bf5c4ee