aboutsummaryrefslogtreecommitdiffstats
path: root/files/ant
Commit message (Collapse)AuthorAgeFilesLines
* Support dynamically linked llvm-rs-ccXavier Ducrohet2013-07-251-2/+1
| | | | Change-Id: I4f8ef81c7a2b5a9bccb2cf6283b80fe9bbe4cc64
* Fix rs compilation through Ant.Xavier Ducrohet2013-06-261-2/+2
| | | | Change-Id: Ib44d693848b47076ed072d72111edebbe513a222
* Merge "Make Java compiler classpath extendable"Xavier Ducrohet2013-03-261-0/+2
|\
| * Make Java compiler classpath extendablechrulri2012-12-201-0/+2
| | | | | | | | | | | | See also: https://groups.google.com/d/msg/adt-dev/6tGCljeIPwE/9_vCzdISuQEJ Change-Id: I9234713b03e5f259af44de5b446a4fb5448ba888
* | Update ant's build.xml to support the build-tools SDK component.Xavier Ducrohet2013-03-202-11/+14
| | | | | | | | Change-Id: I3c36dcb71dc36b930b33c74a959f2a5e43419905
* | Rename project libraries.Raphael Moll2013-03-152-2/+2
|/ | | | Change-Id: I324a5cb5c9c34ec4a8c2e4438bba8ebd56a693e6
* Move -pre-built target ahead of the lib setup.Xavier Ducrohet2012-12-191-1/+1
| | | | Change-Id: Ia48d41c50269c312784ef7723936af1dabcd4887
* Fix Ant help output.Xavier Ducrohet2012-12-051-3/+2
| | | | Change-Id: I415d858ecd1e4c28cd42833c90064d266eeefcf6
* Add flag to disable dex merging.Xavier Ducrohet2012-12-051-0/+2
| | | | | | | | | | | | with dex.disable.merger=true in the project.properties, it is now possible to revert to the old build mechanism where every jar files is always passed to dex during dex'ing instead of pre-dexing them only when they change. This is to go around some issue with dexmerger that are only triggered in some cases. Change-Id: I7288ae4e1ae02b088c2f74f2f63c819c6587016a
* Support package conflicts between app and libs.Xavier Ducrohet2012-12-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | If 2 libraries share the same package name, this is now a build breakage, unless all libraries share the same package. This is because the libraries R classes only contain the resources declared in the libraries themselves (plus dependencies). Since two libraries could share the same package name without depending on one another, it's possible to ensure that creating only one R class would work for both. (Merging both R class might be possible but is too risky for a quick fix like this). If all the libraries share the same package, then a single R class is created for that package that contains all the symbol of the app (simpler than merging all the symbols for now) If a library and the app share the same package name, the R class for the library is not created (since the R class for the app contains all resources). This already worked in ADT, so this changeset only fixes Ant. Change-Id: I95f0b734ba263051961268d960d59749f5b6e1a5
* Add renderscript specific compilation target.Xavier Ducrohet2012-11-301-1/+3
| | | | | | | | | | The property name is "renderscript.target" and is to be located in project.properties. If not present, the minSdkVersion (or 11 if lower) is used. Change-Id: Ic243474ce1d5ce2235cbfdfc45092ed8a5ffbbf7
* Merge "39758: lint gripes about an OK format string"Tor Norbye2012-11-201-1/+1
|\
| * 39758: lint gripes about an OK format stringTor Norbye2012-11-201-1/+1
| | | | | | | | Change-Id: I4a2f9a0a2bb9eb0a3368b4595e040458fadf8e74
* | Change default output name of the lint XML reportTor Norbye2012-11-201-3/+3
|/ | | | | | | | | Change from lint.xml to lint-results.xml, both to avoid confusion with potential lint.xml configuration files, as well as to match the default name expected by the Jenkins plugin. Change-Id: I5df25a853c4523545a11f2651c8d4f784234fd74
* emma: XML and text reports as wellKenny Root2012-10-241-2/+4
| | | | | | | | | | | | Since we have no way for a user to tell emma what kind of report we want, just save all three types. The HTML one is the largest, the XML report is usually less than 10% of the size, and the text report is usually a few kilobytes. Also fix the temporary file cleanup to delete the right coverage.em file. Change-Id: Ifc60fa4bf8a3b6b0e699e20dcbff8c818c19729b
* emma: set HTML encoding to UTF-8Kenny Root2012-10-241-0/+1
| | | | | | | | emma's default HTML encoding was ISO-8859-1 which limits the types of characters it can display. It also confuses some browsers which end up displaying a lot of <?> unicode characters. Change-Id: Ic224ae23fa0652e8e2bc53625ef656d9a7aab689
* Delete emma files after getting them off of the device.Xavier Ducrohet2012-10-231-1/+9
| | | | Change-Id: I9aaa6b9f054eeac7532f9de4d86c7783a8612c0e
* Set the permission of the emma file before downloading it.Xavier Ducrohet2012-10-231-2/+12
| | | | | | Also fix the build file of the a couple of test projects. Change-Id: I5e75f9c4ac397350d7b54e660782d38a2e3de5ad
* 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
* Add Ant support for UI automation test.Xavier Ducrohet2012-08-151-0/+259
| | | | | | | Also fix a bug in a custom ant task where minSdkVersion and targetApi were swapped. Change-Id: Id9bac802377a04270e76def42eaf6a8fb4b3f874
* 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-162-190/+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
generated by cgit v1.1 at 2025-01-26 23:53:18 +0000