aboutsummaryrefslogtreecommitdiffstats
path: root/files
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Move tools and ADT version to 11.Xavier Ducrohet2011-02-101-1/+1
| | | | Change-Id: I4ba19e12a7d11df3d3c1053c30f3998a93b5fb06
* Ant tasks and dependency clean up.Xavier Ducrohet2011-02-081-0/+14
| | | | | | | | | | | Give anttasks.jar a proper manifest with jar dependencies. Update the manifest of sdklib.jar with the common.jar dependency. The pre-setup section of build.xml has changed over time and really we should be able to control it so move it in $SDK/tools/ant/pre_setup.xml and import it into build.xml Change-Id: Iab707deccc0cdbe8d1a9db052ee6fb0762853394
* Tools r10 require ADT 10.0Xavier Ducrohet2011-02-071-1/+1
| | | | Change-Id: Ide739f4e3edddb3ab04519262eee34d28e18bd16
* Add renderscript support to the Ant build system.Xavier Ducrohet2011-01-181-2/+25
| | | | Change-Id: Iba1c956d33725716923da89b788f7f8d14524e41
* Merge "Parse the manifest min/targetSdkVersion to configure the layoutlib."Xavier Ducrohet2011-01-181-4/+4
|\
| * Parse the manifest min/targetSdkVersion to configure the layoutlib.Xavier Ducrohet2011-01-181-4/+4
| | | | | | | | | | | | | | | | This is needed to configure ApplicationInfo in the layoutlib so that some widgets properly apply different behaviors based on the app targetSdkVersion. Change-Id: Ic78af4390d1b871469583f3efc0de3a9da718a6c
* | Move SDK Tools and ADT version to 10.Xavier Ducrohet2011-01-181-1/+1
|/ | | | Change-Id: I6cfde67f2d0a0da2f94124d19e152e99df349820
* Don't reopen a layout if it's already opened.Xavier Ducrohet2011-01-111-3/+3
| | | | | | | | | | This is for the case where a layout is opened and Eclipse tell its editor to re-open it because it was double clicked again in the package explorer due to the MatchingStrategy having returned true. Change-Id: I404494b990215bcdff163a382ecb411e2efb9b51 Misc: reorder configs for the WXGA device config.
* This is tools r9 in tools_r9. DO NOT MERGE.Xavier Ducrohet2011-01-111-1/+1
| | | | Change-Id: I4d6d8cd74abd2cb3b9087ac4f30b761d803e15e3
* Fix layout device list.Xavier Ducrohet2011-01-071-1/+1
| | | | Change-Id: Idb6b0f654cd11225faceeb5b0541703623a0ee83
* merge from open-source masterThe Android Open Source Project2010-12-281-0/+10
|\ | | | | | | Change-Id: I31f069bc3e50c895162d15b4d0d5851a4d380fda
| * Add readme regarding move of adb to platform-toolsRaphael Moll2010-12-231-0/+10
| | | | | | | | Change-Id: I861a1b02a3abb1bb1f9120bbd25f3d4ffd949e9e
* | merge from open-source masterThe Android Open Source Project2010-12-131-1/+1
|\ \ | |/ | | | | Change-Id: I9036a5154f006f1f6ba6685b9b8985db07a66ed0
| * Move to rev 10 and update change logXavier Ducrohet2010-12-131-1/+1
| | | | | | | | Change-Id: I477033c03a40c52d26b73efa892a65feafaba680
* | merge from open-source masterThe Android Open Source Project2010-12-091-1/+1
|\ \ | |/ | | | | Change-Id: I377761c7b5568f9e66331540b8db82f08a09c1eb
| * android.el: Make android-uninstall-app not reinstallRichard Lowe2010-12-091-1/+1
| | | | | | | | | | | | | | - uninstall, rather than reinstalling the app - Fix reference to argument Change-Id: I66afe170c1d0ce2e5acfccf7a0c635fd07764f32
* | merge from open-source masterThe Android Open Source Project2010-12-062-2/+9
|\ \ | |/ | | | | Change-Id: I5a05ec6c6dca06af72779d6c4d66efcaba8abd10
| * Fix ant rulesXavier Ducrohet2010-12-062-2/+9
| | | | | | | | | | | | | | - utf-8 is default encoding for java files. - make encoding, target, source also overridable in the lib rules. Change-Id: I95a6dfd2a815ea9994638c0a0270381819b75a12
* | merge from open-source masterThe Android Open Source Project2010-11-151-0/+1
|\ \ | |/ | | | | Change-Id: I717ec549d6917bc238a3517c091cfcca0609ef8c
| * Add preferences to the list of not proguarded classes.Xavier Ducrohet2010-11-151-0/+1
| | | | | | | | Change-Id: Ib7db435bb640b3a3feaa0534ccc77b6f9eda0800
* | merge from open-source masterThe Android Open Source Project2010-11-151-0/+1
|\ \ | |/ | | | | Change-Id: Ife73a3a44823869ddc2536650aa8f68bbb1f5f45
| * Exclude BackupAgentHelper classes from Proguard.Raphael Moll2010-11-151-0/+1
| | | | | | | | | | | | | | | | | | To use the Backup API in Froyo, an app needs to typically extend this helper class and the class is only referenced from the AndroidManifest.xml, so ideally we should exclude such classes from Proguard by default. Change-Id: I690220d2e89a8ff6d0664be93dad55da8b7b66c2
* | merge from open-source masterThe Android Open Source Project2010-10-272-6/+2
|\ \ | |/ | | | | Change-Id: I8115fa4f83035d6a5aa59bcb0a5603f38f99a59b
| * Fix adb location in ant rules.Xavier Ducrohet2010-10-272-6/+2
| | | | | | | | Change-Id: Ia8188de0b8af0ec4474f5c4ca2cec294c077e03f
* | merge from open-source masterThe Android Open Source Project2010-10-263-0/+51
|\ \ | |/ | | | | Change-Id: I51c83c375936259d6ebe3efabd77eb1f46805236
| * SDK: Fixed proguard.bat & co.Raphael Moll2010-10-263-0/+51
| | | | | | | | | | | | | | | | | | These are similar to the external/proguard/bin/*.bat except they use $SDK/tools/lib/find_java.bat to locate the java location and use it if available. find_java will print a proeminent error if java cannot be found. Change-Id: I1fceae838436053031f405de9b3f1ab2d64222e6