aboutsummaryrefslogtreecommitdiffstats
path: root/anttasks/src/com/android
Commit message (Collapse)AuthorAgeFilesLines
* SDK: Delete projects moved to tools/base or tools/swt.Raphael Moll2013-03-1330-5697/+0
| | | | Change-Id: Iba15f82cb00d19217382c78d8ff37dda1e97ea59
* Fix build after FullRevision package change.Raphael Moll2013-02-151-1/+1
| | | | Change-Id: Ic684b34727d779129f1d8185c2c353b56e91829b
* Fix generation of R classes for libraries to support any package name.Xavier Ducrohet2013-02-011-75/+37
| | | | Change-Id: I0e4f2c0d56285b911f0210a3cddbed0f5ec05ecc
* Fix use case of app + 1 lib that have the same package in Ant.Xavier Ducrohet2012-12-201-1/+3
| | | | | Bug: 40273 Change-Id: I5009d3c95d677953a191145038d6d06cd8b2bf32
* Add flag to disable dex merging.Xavier Ducrohet2012-12-051-1/+6
| | | | | | | | | | | | 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-20/+128
| | | | | | | | | | | | | | | | | | | | | | | 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 filterscript suppport.Xavier Ducrohet2012-11-293-13/+34
| | | | Change-Id: Iaefb640f35bdad1dc5d4be8565c2cafdc02e8324
* TaskHelper: properly parse Pkg.Revision property.Raphael Moll2012-11-191-9/+9
| | | | | | | | | | | | | | SDK Bug: 36987 Bug was that TaskHelper would fail when parsing a pk revision with an RC value. A quick fix was done in CL 6d266a1bf5992d27fff4400c5d2bd30681c65c3d a while ago. Revisit the fix by using the new FullRevision object to parse the value and create a DeweyDecimal; should avoid us trouble if we later change the format. Change-Id: I5ad1449ebd2606255c27485e60b714b5cf83a308
* Add support for dex force jumbo.Xavier Ducrohet2012-10-161-0/+9
| | | | Change-Id: I68188063f0a44af9d38c2a47a53684a68bf346c3
* Fix possible collision in pre-dexed lib filenames.Xavier Ducrohet2012-10-021-2/+30
| | | | | | | | | | | | | | Previously all predexed libraries used the same filename as their source but all predexed libs would go in the same folders, possibly conflicting with each others. This fixes it by making the predexed lib filename use the (hashed) path of the original library. Also added some extra logging to indicate when a predexed lib is used. Change-Id: I7c248f647ee0531334d7fa4f1e943ea0932699d4
* Fix comment from a previous review.Xavier Ducrohet2012-10-011-2/+2
| | | | Change-Id: I772ed35a85093c57f5e6e7b1faac3a60cd49ce3f
* Fix Ant tasks to only generate R class when needed.Xavier Ducrohet2012-10-011-23/+30
| | | | | | | | If a project or library doesn't have resources, then the R.txt file will not be there and we need to support this. Change-Id: I97d971473fc3cbbe9e5e1d16d440084ac4e90406
* ManifestMerger: ability to inject attributes.Raphael Moll2012-09-281-1/+2
| | | | Change-Id: Icbebe1dd3c8cf51f7d38b585a78264d01977e943
* Merge "Pre-dexed libraries."Xavier Ducrohet2012-09-211-7/+60
|\
| * Pre-dexed libraries.Xavier Ducrohet2012-09-211-7/+60
| | | | | | | | Change-Id: I5aabcf3d7acaa9573c991860db3fcc8ea34bc866
* | Fix new R class generation for librariesXavier Ducrohet2012-09-201-1/+2
|/ | | | | | | | - 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-183-13/+95
| | | | | | | | | | | | | | | | 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
* Merge "Fix possible NPE reading dep file."Xavier Ducrohet2012-09-181-29/+11
|\
| * Fix possible NPE reading dep file.Xavier Ducrohet2012-09-181-29/+11
| | | | | | | | | | | | | | | | Fix this by using guava Files instead. Also fixes sdklib's manifest. Change-Id: I5dd4123f389ce1bd8c900933021fc2179e6caa3b
* | Add nullness annotations on overridden methodsTor Norbye2012-09-171-1/+2
|/ | | | | | Eclipse 4.x requires it. Change-Id: Iababca14d8edc8d62bce42f23ee26633dc49cf8c
* ManifestMerger: fix handling of codenames in min/targetSdkVersion.Raphael Moll2012-09-141-2/+24
| | | | | | | | | The change is that the manifest merger will only accept a codename if it's invoked in a context that can resolve that codename to an API level. This allows to produce an error on bogus codenames and to properly check that the API levels match appropriately. Change-Id: Ic70c0c3690b13d94dba81bb78cc09386016b2ef1
* 36987: TaskHelper can't parse the tools revision number "21 rc3"Tor Norbye2012-09-041-0/+5
| | | | Change-Id: I4286930a2d36d21d9eb60a1c96c70276b77b9d4a
* Fix nullability annotationsTor Norbye2012-08-212-6/+8
| | | | | | | | | | | Eclipse 3.8/4.2 requires that any method which overrides another method with a @NonNull parameter (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=381443). This changeset adds @NonNull on various overriding methods in newly added code such that Eclispe 4.2 doesn't show errors. Change-Id: Ice4a4b4dc31ba68c4e0911bb37c15da090076a0d
* Unify all loggers in the sdk tools.Xavier Ducrohet2012-08-173-8/+19
| | | | | | | | | | Removed ILogger from ide_common Removed ISdkLog (and implementations) from sdklib Moved all existing code to com.android.utils.ILogger which is located in common. Change-Id: Icd674d4b8d10f6ae8b60a83acb43cc53c7a52137
* Add Ant support for UI automation test.Xavier Ducrohet2012-08-152-7/+160
| | | | | | | Also fix a bug in a custom ant task where minSdkVersion and targetApi were swapped. Change-Id: Id9bac802377a04270e76def42eaf6a8fb4b3f874
* More refactoring.Xavier Ducrohet2012-08-138-13/+13
| | | | | | | Move stuff out of sdklib into common and ide_common. Remove androidprefs and move the one class into common. Change-Id: I71d126a13cf2ba413692e29616f4968a37d7b33a
* Allow lint cli --sources to specify a path, and use from ant lintTor Norbye2012-08-061-0/+22
| | | | | | | | | | | | | | | 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/+86
| | | | | | | | | | | | | | | | 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-2/+7
| | | | Change-Id: Ie9fa05173a5e4e1c7cae48cabb37f3cfe7d085cb
* Fix parsing SDK Tools in ant tasks.Xavier Ducrohet2012-07-092-7/+10
| | | | Change-Id: Id1db4d2fc318b9318fcd0b7cb204f7ffe0d8429e
* Fix Ant task for 1.8.3 which seems more strict than 1.8.2Xavier Ducrohet2012-06-221-8/+8
| | | | Change-Id: Id88bc5d12d007c4c94ca11b7eddfc911fbd7bddb
* Fix minor errors when used with Eclipse4.Siva Velusamy2012-06-221-14/+17
| | | | Change-Id: Ia31c45715530f58ac293f61185b5a45f71fab4f5
* Add lib source folders to the emma report.Xavier Ducrohet2012-06-151-1/+1
| | | | | | | 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-157-127/+257
| | | | | | | | | | | | | | | | | | | | | 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-145-11/+124
| | | | | | | | | | | | | 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-072-23/+33
| | | | | | | This is from review comments. I meant to upload this before commit but forgot. Change-Id: Ia2eef22f2a5e6a5120110e69b49491a803636768
* Merge "Manifest Merger: rework interface to collect errors."Raphael Moll2012-06-071-1/+2
|\
| * Manifest Merger: rework interface to collect errors.Raphael Moll2012-06-071-1/+2
| | | | | | | | Change-Id: Ib8add07a611d4d496004567fb23b8c5d38b6e487
* | Projects can now access aidl files from their libraries.Xavier Ducrohet2012-06-053-24/+92
|/ | | | | | | | | | | 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-20/+18
| | | | | | | | | | | 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-0/+11
| | | | | | Requires change Ia4caa2a8 from frameworks/base.git Change-Id: Ifcb469a64146ac2ae65f8516ee9dcfb857a7e2aa
* Fix Ant build.Xavier Ducrohet2012-04-231-1/+1
| | | | Change-Id: I0c7d996f9ea3d27ef2cb8daa671c6284be588d54
* Revert the disable flag of the manifest merger to be enable instead.Xavier Ducrohet2012-04-231-7/+7
| | | | Change-Id: I4f89b469e06f741b95b92d7a4826f979c64dab1b
* Minor fixes in Ant.Xavier Ducrohet2012-04-231-1/+1
| | | | | | | 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-203-4/+162
| | | | | | | This merges the manifest of the libraries into the application's manifest. Change-Id: I425e7b75f71d3f50c6422cdb62bb5ec6811ce99d
* Properly exclude some classes in code coverage.Xavier Ducrohet2012-04-161-0/+95
| | | | | | | | 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-1611-829/+1261
| | | | | | | | | | | | | | | | - 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
* SDK: Fix 2 toLowerCase using default locale.Raphael Moll2012-04-112-2/+4
| | | | Change-Id: I33fbad62b3df21068c64ef434d82682d4d192560
* RS Ant support: split opt level per build type.Xavier Ducrohet2012-03-282-6/+9
| | | | | | | 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-273-33/+229
| | | | | | | | | | 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
generated by cgit v1.1 at 2024-09-18 12:30:11 +0000