aboutsummaryrefslogtreecommitdiffstats
path: root/files
Commit message (Collapse)AuthorAgeFilesLines
...
* | Add post package and post build Ant hooks.Xavier Ducrohet2012-01-301-14/+18
| | | | | | | | Change-Id: I3bae567328e1ba615df478cacca72667ef3e6359
* | am 57bda474: am 19fe9514: am 1c148829: Merge "Add coverage filters."Jean-Baptiste Queru2012-01-271-2/+5
|\ \ | | | | | | | | | | | | * commit '57bda47408e8a78aab25a2d258aaf01b55d0058a': Add coverage filters.
| * \ am 1c148829: Merge "Add coverage filters."Jean-Baptiste Queru2012-01-271-2/+5
| |\ \ | | | | | | | | | | | | | | | | * commit '1c14882983df1d5acd76014ae3816f40bfbb3bfc': Add coverage filters.
| | * | 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
* | | Merge "Move the tools/ADT to r17"Xavier Ducrohet2012-01-272-3/+3
|\ \ \ | |/ / |/| |
| * | Move the tools/ADT to r17Xavier Ducrohet2012-01-272-3/+3
| |/ | | | | | | Change-Id: I4989ce98d4c6a600ca075ee919e5a0e1a40a4497
* | SDK: use new find_java.exe in SDK bat filesRaphael2012-01-261-122/+0
|/ | | | Change-Id: I9f3fc572c3af6d8457a75cebae1aa6a850511afc
* 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
* SDK Manager Windows: detach from java process.Raphael2011-11-111-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes 2 issues: - A bug in android.bat was that the bat+lib were only copied if the arguments were 'update sdk'. However since Tools R14 the sdkmanager doesn't use these arguments anymore. - Consequently when invoked as 'android sdk' it was not copying itself in the temp folder and thus was locking the tools folder, preventing updates. - The new behavior is to always copy, like that we don't care how the app is launched. - The SDK Manager.exe was launching android.bat and then waiting for it to finish, capturing its stdout in care there's an error to display. That locks SDK Manager.exe and thus prevent from updating it too. So instead we just don't wait for the bat to finish, don't capture/display its stdout. If there's an error, the user can still use the command line version to find out what's wrong. SDK Bugs: 21212:SDK Setup.exe [keeps] an open file handle SDK Bugs: 11989:SDK Manager.exe should be able to detach (it doesn't do the part where the sdk manager could restart itself after an update though. I'll file a different issue.) Change-Id: Id473ce58d3f36d417b6c0ee5f07a039adbbe06c0
* Move tools and adt to 16Xavier Ducrohet2011-10-281-2/+2
| | | | Change-Id: I79ae1bff5086146cc60b4496f4b0464ffd642651
* 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
* Make source.prop more important than build.prop when parsing platforms.Xavier Ducrohet2011-10-041-0/+27
| | | | Change-Id: I715a7503a7be2b28cd89bd441b8cbb5ee620ccac
* 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
* Tools r14 require ADT 14.Xavier Ducrohet2011-09-271-1/+1
| | | | Change-Id: If07afb667f0b748e859e2e8b70aa1bcc74f0acfe
* CherryPick 15fa2c from master. do not merge.Xavier Ducrohet2011-09-231-13/+9
| | | | | | | | Make the zip align ant step check timestamp on intput/output. If the output is more recent than the input, zipalign does nothing. Change-Id: I51146f0da9697e8f8bfc19e4d6bea80006f101b5
* CherryPick a9a282 from master. do not merge.Xavier Ducrohet2011-09-231-12/+19
| | | | | | Add dependency support for ApkBuilder ant step. Change-Id: Ia51f745f3bb0a91bafe0396804b999a0e39578ea
* Build AVD Manager.exe as part of Windows SDK.Raphael Moll2011-09-191-0/+9
| | | | | | | Also make sure the sdk manager post install will update the AVD Manager as required. Change-Id: I969899adf69f0ed0ddb1ef079451683dd0ce567f
* Pass -target-api to the renderscript compiler.Xavier Ducrohet2011-09-151-6/+7
| | | | | | | This allows to use a single llvm executable to target all API versions. Change-Id: Ib27f7fc9e54c548d31fc98fc323f439cb99218d5
* Merge "Make the dependency graph use extension restrictions per folder."Xavier Ducrohet2011-09-021-2/+1
|\
| * Make the dependency graph use extension restrictions per folder.Xavier Ducrohet2011-09-011-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before there was a way to filter touched file by extension(s) but this was for all input folders. Now each input folder can have a different set of extension restrictions. This will allow apkbuilder to use DependencyGraph and extension restriction for all its input folders. Also fixed an issue where aapt would not package the resources if an xml files was touched. This is because it didn't make a difference between compiling the resources for IDs and packaging the resource values. Change-Id: I797d3a24c6c1f999e9d412c4ff8aa826ed16fc09
* | Merge "Windows: look for Java in %ProgramFiles(x86)%."Raphael Moll2011-09-011-5/+23
|\ \ | |/ |/|
| * Windows: look for Java in %ProgramFiles(x86)%.Raphael Moll2011-09-011-5/+23
| | | | | | | | | | | | Cf bug 19551. Change-Id: Id5ce9b0e792e7e189f9fc12e0dcfc6a63e0e2704
* | Add proper dependency support in the dex step of the Ant-based build.Xavier Ducrohet2011-09-011-18/+14
| | | | | | | | | | | | | | | | | | | | The dex step now generates a dependency file that is reused during following builds to check whether dex should occur. Also optimized the part that figures out if any dependencies have been modified/have gone missing. Change-Id: I7f6e915fc7b571ad973260daa506badced3a9c2a
* | Add support for proper dependency detection in the aidl ant compilation step.Xavier Ducrohet2011-09-011-4/+7
|/ | | | | | | | | | Aidl compilation now generates dependency files that are reused on further compilations to only recompile files that needs it based on source files modifications. Also clean up output (and dependency) files when a source file is deleted. Change-Id: I3131463fd7939ffc4b5bbdfa49940e03f0249a28
* Prevent running debug and release targets at the same time.Xavier Ducrohet2011-08-231-12/+26
| | | | | | | This is not possible since they rely on the same properties which cannot be updated after they are set. Change-Id: I2fbc0f53b656f5906c2b026d8fd41d78a4461803
* Renable test coverage from Ant.Xavier Ducrohet2011-08-221-31/+44
| | | | | | | | Added a warning regarding the requirement of a rooted device. Also made it so that the test can be run without having to build and install the packages with just "ant emma test" Change-Id: Id643b5f56585954b91c9c85c3eb33c4ef31c196a
* Don't regenerate R.java if a non xml resource is modified.Xavier Ducrohet2011-08-181-1/+2
| | | | Change-Id: Ie28359234cbb56e14c42274434831e4795bf3ee3
* Rename main_rules.xml to build.xmlXavier Ducrohet2011-08-171-0/+0
| | | | | | | This is the final name. I kept main_rules to make the previous review easier. Change-Id: I3dfcd36a49f2893665e712ed9391acb4486d713e
* New library project mechanism.Xavier Ducrohet2011-08-174-679/+810
| | | | | | | | | | | | | | | | Libraries now generate a jar file that is used by the projects referencing them, instead of having the main projects compile the library source code themselves. This means we can remove the link mechanism that created linked folder in ADT and instead use a container that is lazily initalized to be all the jar files of the libraries. Also merged all 3 Ant build files (main_rules, lib_rules, test_rules) into a single build.xml that can build any kind of projects. Lot's of improvement in there too. Much cleaner. Change-Id: I98307e25cd76722e8595938528e6ef57a7e226ad
* Expose version.name property for aapt task.Tero Saarni2011-08-151-0/+2
| | | | | | | | | | The new property makes it possible to create ant build scripts that programmatically determine and set the versionName attribute during build. Similar property already exists for versionCode. Signed-off-by: Tero Saarni <tero.saarni@gmail.com> Change-Id: Ia36632ae029785563fc7c1bc8937034963016852
* Update tools/ADT to rev 14.Xavier Ducrohet2011-08-021-2/+2
| | | | Change-Id: Id29498fde61185a63812b7267b64560a8fd54dc5
* Add support for aapt CrunchCache in ADT and AntJosiah Gaskin2011-07-211-2/+21
| | | | | | | | This change lets ADT and Ant use the crunch cache system set up in change I58271fb2. This commit is separate because sdk and framework are separate git repositories. Change-Id: If2828d157acad0b5adb812001e777c199e3c62fe
* Merge "Add 7" tablets to device list used in the layout editor."Xavier Ducrohet2011-07-191-0/+28
|\
| * Add 7" tablets to device list used in the layout editor.Xavier Ducrohet2011-07-131-0/+28
| | | | | | | | Change-Id: Ib46d23c1ad85e2b0b4b77040cd3498051c79e926
* | Properly support spaces in ant project directories.Raphael Moll2011-07-111-1/+2
|/ | | | | | | | | After applying https://review.source.android.com/24515 for the dalvik/dx change, this allows ant project to build correctly on Windows if there's a space in their directory path. Change-Id: I4c6d5f87fae2dcf2955698633a16a0bde501694f
* Move tools to 13.Xavier Ducrohet2011-06-211-1/+1
| | | | Change-Id: Ibedcb5627170d107cacf5e9d212f9da11c8d1f3e
* Fix proguard template to avoid shrinking XML-only referencesTor Norbye2011-06-101-2/+6
| | | | | | See 16384: ProGuard template generated by the ADT is flawed Change-Id: I6ebbcf059bbee8c485747dcee55f4ecfa14b6831
* Move tools to r12 and ADT to 12.0.0Xavier Ducrohet2011-06-061-1/+1
| | | | Change-Id: Ifcf5190547e9e37bdda766ad3d57a312c2dbb481
* Fix space-in-dir issue with Proguard for the ant case.Raphael Moll2011-05-121-12/+26
| | | | | | | | | | | | | | | This fixes the proper way to quote the compound paths arguments given to proguard. Each individual path is quoted if it contains spaces. Quoting for -libraryjars fixes the issue for the SDK install path containing a space. Quoting for -injars and the other arguments fixes the issue for the project path containing a space (although the ant build will fail later at the dx phase in this case.) Change-Id: I74283b4f1b19c353c1a5ed36e4d0ec58676b6a79
* Fix proguard wrapper to capture all args.Raphael Moll2011-05-121-2/+2
| | | | Change-Id: Ic926f3d5c39a3f14c9a54de70576c94508acf2ba
* Better default selection when choosing a device config.Xavier Ducrohet2011-03-241-1/+28
| | | | Change-Id: Iacaabec4ad9e9dd55397dc2cc3e6bfadc0c11ff2
* 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