aboutsummaryrefslogtreecommitdiffstats
path: root/files
Commit message (Collapse)AuthorAgeFilesLines
* am 767262f7: am 0738ab16: Merge "Add \'asset.dir\' property to build.xml"Xavier Ducrohet2012-03-301-1/+2
|\ | | | | | | | | * commit '767262f720a14928dc934b26d0f763cdb70fe5ac': Add 'asset.dir' property to build.xml
| * 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
* | Move tools and ADT to 19.Xavier Ducrohet2012-03-291-1/+1
|/ | | | Change-Id: I3906416a7b5a4bf7b7e2f86ee3155c22d93a3c2b
* 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
* | Add exclusion for Fragments in proguard.Xavier Ducrohet2012-03-081-0/+2
| | | | | | | | Change-Id: I158e85a3c0a831788b11350ea7b33d41d9b5b0a4
* | 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
* | Merge "SDK: generate repo using latest schemas."Raphael Moll2012-03-071-1/+1
|\ \
| * | SDK: generate repo using latest schemas.Raphael Moll2012-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | Requires dev.git change I250fe7a3 to build properly. Also requires Change Ia307af09 for addon. Change-Id: Ib0363f06ce2754c58b5f2ba31c4f0720b933f0d8
* | | 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-213-7/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Galaxy Nexus to devices.xmlXavier Ducrohet2012-02-061-0/+27
| | | | Change-Id: I22b4a05a2fee098aeb83b42101d5585a3933dce0
* Merge "Update default proguard.cfg file"Tor Norbye2012-02-011-3/+27
|\
| * Update default proguard.cfg fileTor Norbye2012-01-121-3/+27
| | | | | | | | | | | | | | This changeset updates the default proguard.cfg file bundled with the tools. Change-Id: If7163a3b8855dd88a58a3e83bb05793733764209
* | 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
|\ \ | |/ |/|
generated by cgit v1.1 at 2025-01-11 09:19:47 +0000