aboutsummaryrefslogtreecommitdiffstats
path: root/files/ant/build.xml
Commit message (Collapse)AuthorAgeFilesLines
* Add support for dex force jumbo.Xavier Ducrohet2012-10-161-0/+8
| | | | Change-Id: I68188063f0a44af9d38c2a47a53684a68bf346c3
* Merge "Pre-dexed libraries."Xavier Ducrohet2012-09-211-0/+3
|\
| * Pre-dexed libraries.Xavier Ducrohet2012-09-211-0/+3
| | | | | | | | Change-Id: I5aabcf3d7acaa9573c991860db3fcc8ea34bc866
* | Fix new R class generation for librariesXavier Ducrohet2012-09-201-1/+1
|/ | | | | | | | - only generate the R class of libraries when the project is not a lib - package the manifest classes of libraries since we only do delayed generation of the R class now. Change-Id: I54908984651dab73b3496145120e2ee7cf9c6c9a
* Generate smaller R classes for libraries.Xavier Ducrohet2012-09-181-0/+4
| | | | | | | | | | | | | | | | Using the new --output-text-symbols from aapt the build system now generates the R class for libraries manually based on the symbols exported by the libraries and the final values computed by aapt when using all the resource folders. Because only R.java is concerned, the Manifest class is now included in the library jar file. Also added a new test apps that uses instrumentation to verify the build system. Change-Id: Ic436ea8eb070844e9db8b3b2620fbf665839d40b
* Allow lint cli --sources to specify a path, and use from ant lintTor Norbye2012-08-061-1/+3
| | | | | | | | | | | | | | | First, this changeset allows the arguments passed to --sources and --classpath (renamed from --classes) to specify not just a directory, but to specify a path as well. This might make it easier to invoke lint from scripts if you have a path variable, so you don't have to split it into multiple arguments. Second, it makes the lint task in ant use these, such that any build.xml customizations to the source paths or class paths are automatically used rather than relying on lint's default structure check. Change-Id: Id8e4caf0010d7fd7245844b3099b5dc0607f0aba
* Add lint target for antTor Norbye2012-07-231-0/+22
| | | | | | | | | | | | | | | | Running "ant lint" will now run lint on the project, and dump out the errors to the console as well as also export the errors to lint.xml and lint.html int the bin/ directory. This changeset also modifies the lint CLI to allow multiple simultaneous result reporters - so you don't have to run lint twice in order to get both an .xml and an .html report for example (which is useful when you're running lint on a continuous integration server, and you want the .xml file for the lint plugin trend graph and the html file as a user readable report to click through to from the build page.) Change-Id: Idf8f3f5de0857eb9e7180267a066ae933640682d
* Fix renderscript compilation from Ant.Xavier Ducrohet2012-07-101-1/+1
| | | | Change-Id: Ie9fa05173a5e4e1c7cae48cabb37f3cfe7d085cb
* Fix detecting previous build states.Xavier Ducrohet2012-07-031-36/+35
| | | | | | | The checks were done before reading the properties. Bug: http://code.google.com/p/android/issues/detail?id=34127 Change-Id: I954d1e2c585ec57ed3c1f5fc371b0af7dfa3c369
* Add lib source folders to the emma report.Xavier Ducrohet2012-06-151-2/+20
| | | | | | | This allows seeing the library source code in the HTML report. Change-Id: I30cd9fa99d2962bb4c12cba6f2ba044857836b93
* Fix issue where libraries were not getting instrumented.Xavier Ducrohet2012-06-151-7/+24
| | | | | | | | | | | | | | | | | | | | | They actually were instrumented but the emma output file was not passed to the report task. After trying to make each library generate its own .em file and passing to the report task, I gave up due to FileSet (and the report task) being stupid. So the main fix is having the libraries contribute to the main coverage.em file (since it's build using the merge option) which location is passed to the library project. The changes to the custom task was to support querying the libraries for a path with a given leaf (from the lib root folder) but this is not used at the moment. The other tasks are slightly cleaned up due to this though and are getting prepared to support customized folder names in folder. Change-Id: Ife59a2971ce6f2acf01b923abe90dea8adee462a
* Fix emma for split projects.Xavier Ducrohet2012-06-141-10/+15
| | | | | | | | | | | | | The location of the .em file was wrong. Changing its location means it gets put in the tested project so we need a way to know where the output of the project is. As we need to be better at supporting customized projects folder, we introduce a new task that will be able to look for the customized path of any projects. So far we only support the output folder and the source folder. Change-Id: Id8db82e254baae2088827c96b7719f94c92c927c
* Fix to improved aidl supportXavier Ducrohet2012-06-071-2/+2
| | | | | | | This is from review comments. I meant to upload this before commit but forgot. Change-Id: Ia2eef22f2a5e6a5120110e69b49491a803636768
* Projects can now access aidl files from their libraries.Xavier Ducrohet2012-06-051-2/+7
| | | | | | | | | | | Library projects now copy their aidl files into bin/aidl. Aidl is now called with this import path for all referenced library projects. Also added a test project. Change-Id: I7f94489e87450be67a16ed7198f85b8b472f5025
* Use aapt output to feed proguard's keep list.Xavier Ducrohet2012-05-291-1/+3
| | | | | | | | | | | This allows us to only keep classes that are really used either through code or through XML. Also tweak the default rules for better control of animated properties. Added a test of a custom property animation and fixed some other misc test files. Change-Id: I7cc5839a764881d8d3c7bfce0a3f12ea7cba660e
* SDK/ant: pass --ignore-assets flag to AAPT.Raphael Moll2012-05-171-2/+16
| | | | | | Requires change Ia4caa2a8 from frameworks/base.git Change-Id: Ifcb469a64146ac2ae65f8516ee9dcfb857a7e2aa
* Merge changes I4f89b469,I33b49c9f,I425e7b75Xavier Ducrohet2012-04-231-112/+58
|\ | | | | | | | | | | | | * changes: Revert the disable flag of the manifest merger to be enable instead. Minor fixes in Ant. Manifest merger in Ant build.
| * Revert the disable flag of the manifest merger to be enable instead.Xavier Ducrohet2012-04-231-2/+2
| | | | | | | | Change-Id: I4f89b469e06f741b95b92d7a4826f979c64dab1b
| * Minor fixes in Ant.Xavier Ducrohet2012-04-231-76/+2
| | | | | | | | | | | | | | Moved the definition of the custom Ant tasks into a properties file put in the jar files. Change-Id: I33b49c9f8f51ffa4f8a8dcaefccc6e0d874a6a9d
| * Manifest merger in Ant build.Xavier Ducrohet2012-04-201-41/+61
| | | | | | | | | | | | | | This merges the manifest of the libraries into the application's manifest. Change-Id: I425e7b75f71d3f50c6422cdb62bb5ec6811ce99d
* | Update location of emma's temp files.Xavier Ducrohet2012-04-231-3/+3
|/ | | | | | | | This ensure they are always put in the bin folder even if the script is run from another folder than the project one. Change-Id: Iafda3217f4ddc03f11e8821f089bf855caa99e7d
* Properly exclude some classes in code coverage.Xavier Ducrohet2012-04-161-1/+12
| | | | | | | | Using a custom task to create the filter based on the app packages for the main project and its library projects and the list of class to exclude. Change-Id: Id37862bf53656bd17991b5c307d772ed2019650b
* Fix "ant test" + misc clean up / reorganization of build.xmlXavier Ducrohet2012-04-161-184/+237
| | | | | | | | | | | | | | | | - Split NewSetupTask in several tasks to make things more flexible. Particularly this allows more targets to get access to the project type (app, lib, test, ...) as it's not so computive intensive. - Fix test project to give them access to the full tested project's classpath. - Fix support for projects that test themselves. - Make sure library projects are instrumented when using the emma target. Change-Id: Ia0c9564eacee2521e7cbd5154b8a85ea287ad4fd
* Add 'asset.dir' property to build.xmlMichael Zoech2012-03-291-1/+2
| | | | | | | | | | | The 'asset.dir' property was available in previous releases. It was possible to set the assets directory that should be used in the build process by defining 'asset.dir=../relative/path' in the ant.properties file. Currently, only the "asset.absolute.dir" property is available. While one can override this property with a relative path, the name suggests that this shouldn't be done. Change-Id: Ia421862c9eb736e3e1dfedaa8bdd4ff3e943941e
* RS Ant support: split opt level per build type.Xavier Ducrohet2012-03-281-3/+8
| | | | | | | Also make sure the Renderscript files are rebuilt when the build type (debug/release) changes. Change-Id: I688fc3f8550e3133ee32de3ef074efa75ccc3b67
* Use our own signing code in Ant and don't rely on Jarsigner.Xavier Ducrohet2012-03-271-5/+8
| | | | | | | | | | JDK7 changes the default signing algorithm and breaks release builds where the ant script does the signing after building the apk. This changes the Ant script to use a custom task that uses the same code that is already used to sign debug apps. Change-Id: I0df7378a7a59b54ef6a17db363a2127736f4434e
* Output for proguard config in release.Xavier Ducrohet2012-03-231-43/+45
| | | | | | | Also tweak the level of our <echo> message which should be of level INFO but the attribute defaults to WARN Change-Id: I5f302400e24c250cada8fb883678264b57480615
* Merge "Enable passing of debug and optimization flags to slang in Ant builds."Xavier Ducrohet2012-03-221-1/+9
|\
| * Enable passing of debug and optimization flags to slang in Ant builds.Matt Kopec2012-02-281-1/+9
| | | | | | | | Change-Id: I8c6affe825b93eefb7ed60000740aa2783d93a20
* | Ant build now sanitize jar files in setup task.Xavier Ducrohet2012-03-071-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the list of jar files was sanitized (to remove duplicates) in the dex task, but this meant the full list (with duplicates) was passed to proguard when building in release mode. This changeset move the sanitization of the jar files in the Setup Task so that the script later only deals with a sanitized list. The means the content of libs/*.jar for the current project must be looked at in the task instead of later in the XML script. Change-Id: Ib5253b80ee7c1ded004bcdad6184e0900b7a7543
* | Only generate the libraries R/manifest classes in the app project.Xavier Ducrohet2012-03-011-1/+1
| | | | | | | | | | | | | | If the project is a library itself then there's no need to generate them. Change-Id: I9896e2bac81979797cca10fc606c66e5139fc9a1
* | Never add R/R$* classes to the library jar files.Xavier Ducrohet2012-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous change added excluding Manifest and BuildConfig but made it so that it was only for the current app package. The problem is that project that depends on libraries also generates R classes for their libraries. If the project itself is a library then the R classes from the libraries would get in the library jar output. If the main project had some diamond dependencies in its libraries then the same R class from a library could be added twice to its dex input causing an error. Change-Id: I0ef4a3c3f84bf9099de27e275fa856b6c044978d
* | Improve "ant all clean" to clean libraries only once.Xavier Ducrohet2012-02-271-1/+2
| | | | | | | | | | | | | | | | This is done by going through the flat dependency of the main project and not having the libs look at their own dependencies. This is similar to what has been done for the regular build steps. Change-Id: I597c8f931c231c5260cc5b33965b9938fe24c01f
* | Ensure R/Manifest/BuildConfig classes are not added to the library jar file.Xavier Ducrohet2012-02-271-1/+9
|/ | | | | | | First, their are not needed there, second they can create a dx conflict if the library uses the same package as the app. Change-Id: I67b3f478d5d7ab79d02b6ece8b1eae31b8ed104e
* Fork javac on windows to prevent file locking.Xavier Ducrohet2012-02-231-1/+13
| | | | | | | | | | | | | | On Windows, when using java 1.5/1.6 running javac without fork=true can result in file locking preventing further changes to them. This changes sets fork=true in this case (win, java 1.5/1.6). More info: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6558476 Bug: 24577 Change-Id: I6477ab0615c5a535b2011f2e9f40bc8f818f67a2
* Split ProGuard file into two halvesTor Norbye2012-02-211-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset splits the proguard.cfg into two halves: (1) All the general Android settings go into $ANDROID_SDK/proguard/proguard-android.txt. This defines shrinking rules like keep custom views, etc. The crucial point is that this information is maintained and updated by Tools updates, so whenever new APIs are added to Android, or whenever bugs are found in the configuration such as flags needed to work with Dalvik, we can make the updates - we don't have old snapshots living on in projects. (2) Any project specific settings go to proguard-project.txt in the project. (3) The proguard.config property in project.properties now refers to a *path* of configuration files, which are all passed to ProGuard in the given order. The code which processes this setting will substitute android.sdk.home and user.home variables, so the path does not have to be hardcoded to point to the project-android.txt file. The default project templates have been updated to include a commented out configuration setting up proguard as described above. The default proguard file name was changed from proguard.cfg to proguard-project.txt such that it can be directly opened in Eclipse and to make it clear it's an editable text file. Lint was updated to find the Proguard file via the proguard.config property as well as via the old and new default names for projects not enabled with ProGuard. A subsequent CL will add a lint check which identifies projects containing the old setup (full local configuration) and offer to replace it with the new setup. Change-Id: I44b4c97a160114c2382f02f843c95486a0dc9d6b
* Add post package and post build Ant hooks.Xavier Ducrohet2012-01-301-14/+18
| | | | Change-Id: I3bae567328e1ba615df478cacca72667ef3e6359
* Add coverage filters.Keita Kita2012-01-271-2/+5
| | | | | | | | | | * Add exclusion filters prevent from including generated R and BuildConfig class in coverage report. * Add emma.filter property for filtering (inclusion and exclusion) instrumentation. Change-Id: I0b6764e5f60917d004b7b3335ac060e82921c603
* Misc Ant build fixesXavier Ducrohet2011-11-231-3/+13
| | | | | | | | | | | | - project name on standard build rules - allow override out.final.file - allow passing custom javac parameters - allow note having local.properties as long as sdk.dir is present anyway - -pre-clean target allows custom clean build Bug 21023, 21267, 21465, 21525 Change-Id: I4bee2f8c15fab664b1f4ff54d754920d2487f6c7
* Add nodeps support to install/uninstall.Xavier Ducrohet2011-10-211-6/+18
| | | | Change-Id: Ia03a4c55567680a8365df8a83079c7d370747697
* Fix ant test, ant installt and ant uninstall (for test projects)Xavier Ducrohet2011-10-211-16/+30
| | | | | | Bug http://code.google.com/p/android/issues/detail?id=20979 Change-Id: Id861d493c9b73dcfc9e81bdc8fb6c8b7c8ed0e55
* Fix "ant test".Xavier Ducrohet2011-10-201-1/+1
| | | | Change-Id: If7dab5116ec0351f712aa26673c3b3d36026bb96
* Rename the modifier target only to nodeps.Xavier Ducrohet2011-10-141-6/+6
| | | | Change-Id: I26dc7be4f06758c0be7f4dbcbc358b805ba44945
* Fix NPE when building project with no code.Xavier Ducrohet2011-10-141-1/+1
| | | | | | | | The lack of dex file made the Ant package task throw an NPE. Also some minor typo fix. Change-Id: Ic617ee66017c402f211f5400baf5a00eb7e6cff5
* Improve indirect library dependency support.Xavier Ducrohet2011-10-141-5/+20
| | | | | | | | | | | | | | | | | | | | | Previously with the following setup: Main app depends on Lib1, Lib2. Lib1 and Lib2 both depends on Lib3. Lib3 would be compiled 3 times, as the main app would attempt to build it and then Libr1, and Lib2 would do it too. Of course it wasn't actually built 3 times. After the first time it would do nothing, checking dependencies and do nothing. However, for projects will a lot of libraries and a lot of indirect dependencies this could slow down a lot compilations, as the build would spend its time checking whether to build the same library many times. This ensure that only the main project attempts to build all of its library dependencies (direct and indirect), in the right order of course. When libraries are built they are told (through the "only" target) to not build their dependencies. Change-Id: Ie80f32a96e3c473d897aca5d05bf6fe9ea086884
* Add BuildConfig to ant SDK project.Xavier Ducrohet2011-10-141-29/+84
| | | | | | | | | | | | | | | The BuildConfig class contains a single boolean constant called DEBUG which is true only for debug/instrumented builds. This allows developers to create debug only code that's automatically stripped from release builds. Also fixed some issues with dependency check for other tasks, notably the aapt task that would always find new files due to not filtering out files that are ignored by aapt itself (hidden files, version control files, etc...) Change-Id: I4391a87c064a185d6b337ca46e3a9f0e43c5174d
* Improved RenderScript support in SDK build.Xavier Ducrohet2011-10-101-1/+2
| | | | | | | | - renderscript output is now in bin/res/ instead of res/ - Ant build system properly handle dependencies to only recompile files that need it. Change-Id: Ic2cd4487a26e7a7fcb0b475ee52fa0ccf8a07c0b
* Ant build didn't use -non-constant-id for libraries!Xavier Ducrohet2011-10-061-0/+1
| | | | Change-Id: I966b8796008b87dd3e6101d8c6d09271e2621c52
* Also process and cache the png files in libraries.Xavier Ducrohet2011-09-281-11/+8
| | | | | | | | | | | The png in the libraries were not processed by the crunch step. Because aapt never processes png files anymore (relying on the crunch step to do it), the png files in libraries were never processed. While this is less a problem for standard png files, this completely breaks 9-patches that must be processed to actually behaves as 9-patch. Change-Id: I0a1fe14ea34f6d36a368b456494410945afc3c44
* Make the zip align ant step check timestamp on intput/output.Xavier Ducrohet2011-09-231-13/+9
| | | | | | If the output is more recent than the input, zipalign does nothing. Change-Id: Ic1d7518a28fbb2db8895903e5cd0fd2976931b41
generated by cgit v1.1 at 2025-03-04 00:44:05 +0000