aboutsummaryrefslogtreecommitdiffstats
path: root/testapps
Commit message (Collapse)AuthorAgeFilesLines
* Some changes added to compile and run with Java 6 and Java 7.Jerome Pilliet2012-12-173-6/+6
| | | | | | | - correction of errors with Javac 6: - target 1.5 and source empty. Change-Id: I0e0587c6af5b304e8fa08524b8fb16195e50eefa
* Set the permission of the emma file before downloading it.Xavier Ducrohet2012-10-232-2/+20
| | | | | | Also fix the build file of the a couple of test projects. Change-Id: I5e75f9c4ac397350d7b54e660782d38a2e3de5ad
* Update test app with new project files.Xavier Ducrohet2012-10-223-53/+61
| | | | Change-Id: I3e59f7880afce36c3ee1195e0927d43208c5c4e1
* Generate smaller R classes for libraries.Xavier Ducrohet2012-09-1871-2/+1736
| | | | | | | | | | | | | | | | 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
* Fix emma for split projects.Xavier Ducrohet2012-06-146-32/+42
| | | | | | | | | | | | | 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
* Projects can now access aidl files from their libraries.Xavier Ducrohet2012-06-0523-2/+541
| | | | | | | | | | | 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-2923-84/+328
| | | | | | | | | | | 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
* Merge changes I4f89b469,I33b49c9f,I425e7b75Xavier Ducrohet2012-04-234-20/+17
|\ | | | | | | | | | | | | * changes: Revert the disable flag of the manifest merger to be enable instead. Minor fixes in Ant. Manifest merger in Ant build.
| * Manifest merger in Ant build.Xavier Ducrohet2012-04-204-20/+17
| | | | | | | | | | | | | | This merges the manifest of the libraries into the application's manifest. Change-Id: I425e7b75f71d3f50c6422cdb62bb5ec6811ce99d
* | Allow src/doc attachement for 3rd party jars in libs/Xavier Ducrohet2012-04-232-0/+2
|/ | | | | | | | | | | | | | | | | | | | | Since those jars are added dynamically through a classpath container, the devs cannot set the source path and the javadoc through Eclipse UI (container don't allow editing those). To fix this, and to make sure that both paths are picked up not only by the current project, but also by other projects (if the current project is a library project), the value is set by a file sitting next to the jar file. The file is name after the jar file, adding .properties at the end. For instance foo.jar -> foo.jar.properties It can currently contain 2 properties: src: relative or absolute path to the source folder (or archive). doc: relative or absolute path to the javadoc. Change-Id: I4f716374ac99479caf65453973bcb1f35ba84590
* Fix "ant test" + misc clean up / reorganization of build.xmlXavier Ducrohet2012-04-1629-34/+610
| | | | | | | | | | | | | | | | - 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
* Updated test apps for the SDK.Xavier Ducrohet2012-03-2858-354/+132
| | | | | | | | | - added buildconfigtest - removed libWithLibTest which is redundant with libsAndJarTest - updated libsAndJarTest to have lib1 depend on lib2. - Added COMPILE_AND_RUN for test apps that must be run. Change-Id: If57a684826a04c0821932edd71e9970b0eb92f4b
* Implements test application for sensors.Vladimir Chtchetkine2012-03-2211-0/+381
| | | | | | | | This application is intended to run in the emulator to test sensor emulation. This app listens to all the available sensors, and display their values on the screen. So, it's easy to see if sensor emulation works using this application. Change-Id: Iff4f9898fcfa6842bc4644e977dd8fa27972f60f
* Fix minSdkVersion on gridlayout test app.Xavier Ducrohet2012-03-151-7/+15
| | | | Change-Id: I9a70eaf876c14ee1808ea3fa3961cbf6aa830965
* New test projectsXavier Ducrohet2012-03-0747-0/+794
| | | | | | | | This is similar to javaProjectTest without the reference to the Java-only Eclipse project so that it can be tested with Ant. Change-Id: I2f7887ec79cf6cdd7dad7037abb67390906d54f1
* Update test project to support proguard.Xavier Ducrohet2012-03-0714-6/+8
| | | | | | | | The code read java resources using relative path which breaks when the classes and their packages are renamed (the java resource isn't moved to the new package name.) Change-Id: I9b9d14288d8c16fd7342cd743251e5681bb0f1ef
* Merge "More changes to the test projects."Xavier Ducrohet2012-03-0749-3/+443
|\
| * More changes to the test projects.Xavier Ducrohet2012-03-0749-3/+443
| | | | | | | | Change-Id: I823bcc19b7de6cea4c985f2c01feccddd6f8022d
* | Merge "Only add Java project to the dependencies if they are exported."Xavier Ducrohet2012-03-073-3/+3
|\ \ | |/
| * Only add Java project to the dependencies if they are exported.Xavier Ducrohet2012-03-063-3/+3
| | | | | | | | Change-Id: Ieae3414762d062b745b9b47bdea8c31a6593e34f
* | Add a test project using a support library with gridlayout.Xavier Ducrohet2012-03-0623-0/+657
|/ | | | Change-Id: I1dbf1729e8af03e5d597e6372b56db0f47f39890
* Only add Java project's jar file if they are exported.Xavier Ducrohet2012-03-063-1/+2
| | | | Change-Id: Ia44fab93718ac83aee1783e08c606d234c7afcfe
* Remove obsolete test projects.Xavier Ducrohet2012-03-0661-1140/+0
| | | | Change-Id: Ic4e2dec427268497f5ab9ee24c6e21bd50ef2139
* Update test project.Xavier Ducrohet2012-03-061-0/+0
| | | | | | | | Add a jar in the libs folder of a Java project to test that they are not automatically added to the Android project classpath. Change-Id: I0d5923b12de34bf6c5a025b53d809b02f4843c0f
* Add new test projects.Xavier Ducrohet2012-03-0247-2/+605
| | | | | | | - test for User Library usage - test for test project with library. Change-Id: I49b7d4702937f634a1df907af327a979af09f227
* Fix the test projects eclipse setup.Xavier Ducrohet2012-03-029-9/+0
| | | | | | | They shouldn't manually add their jar to the classpath anymore. Putting jar files in libs/ is enough now. Change-Id: I3ea7731082f306257531798f34eaa8eb68109c18
* More fixes to the test projects.Xavier Ducrohet2012-03-02184-438/+689
| | | | | | | | | | - add eclipse files for a bunch of them - package name refactoring to match the folder structure somehow (more need this) - updated the javaproject to have an extra java project and to have code that access java resources to test packaging too. Change-Id: Ie13842c1b891e495e04d8a157a12cac9db13f30e
* Fix test projectsXavier Ducrohet2012-03-0115-10/+319
| | | | | | Add Eclipse project files and basic ant files too. Change-Id: I23abf9ec396414e2d36da792a182118a11a70a5a
* Java project dependencies on libs are automatically added to main project.Xavier Ducrohet2012-03-012-0/+1
| | | | | | | | | | | | | Android Library projects can reference other Java-only project. This used to be added to the library jar output. This created an issue if two Library projects were referenced by the same app as the java project was added to both library jar files. This change makes it so that the java project output is not in the library jar files but is instead added to the container of the main app as a project classpath entry. Change-Id: I9f8bbb104e29aede5393afd5ea4b8fe882145d49
* Move Android project with Java project dep test to its own folder.Xavier Ducrohet2012-02-2944-22/+484
| | | | | | | | | | Also make it more complex: - java project references a jar file. - 2 libs depend on the java project - app project only reference the libs, not the java project (it still does but indirectly). Change-Id: I8fc53e0f868ce014ea99486e7b1fa6fe0f197daa
* Add a new test app with indirect lib.Xavier Ducrohet2012-02-2727-0/+362
| | | | Change-Id: I9946ade7950741faad6f76aeb84e8d6bd05a5455
* Ensure R/Manifest/BuildConfig classes are not added to the library jar file.Xavier Ducrohet2012-02-271-0/+11
| | | | | | | 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
* Fix support for custom views in library on ADT's side.Xavier Ducrohet2012-02-2425-0/+766
| | | | | | | | | Don't check for final field when parsing R.java (in libraries fields are not final anymore) and fix a bug in the new aaptparser which would return a failed to parse aapt error when the output is empty. Also add customview in library test app.
* Fix issue when a project and its libraries use the same jar files.Xavier Ducrohet2012-02-2489-3/+1769
| | | | | | | | | | | | | | | | | | | | | | | | | | This is only an issue in Ant because in Eclipse we don't automatically pull the jar files from libraries into the main project (we should somehow now that we have the Library Projects jar container that is dynamic). Right now we do a simple size/sha1 check on libraries that have the same name to figure out if they are the same version. If they are we only use one in the dex step (that notoriously fails to add the same class twice). If they are different we stop the build as it's an error (having two library projects depending on two different versions of a jar file should be an error as we can be sure the two versions are API compatible). For later: not use the file name only? find a way to version the libraries and to have them declare whether they are API compatible with older versions? Also added a hard-coded case for the Android Support Library. If both the v4 and the v13 are detected, use the v13 only as it includes the v4 already. New test apps. Three cases: - main and library projects with duplicate jar files that are identical - main and library projects with duplicate jar files that are NOT identical - main and library projects with v4 and v13 in the dependency list. Change-Id: I3a9abdcbec635d7c9d3228bdd105120f77178b27
* New library project mechanism.Xavier Ducrohet2011-08-1710-15/+9
| | | | | | | | | | | | | | | | 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
* Change the JavaGenerator to handle output and dependencies.Xavier Ducrohet2011-01-311-2/+1
| | | | | | | | | | | | | | | | | | | Previously, the generator only handled a list of files to compile and a list of files that were removed. Now the Generator provides all that needed to do incremental builders with known state. On top of providing a default deltavisitor it handles file dependency and list of output files. The aidl generator was updated to use this, and the renderscript generator will use the same mechanism. Also fixed the abortOnBadSetup which through CoreException which did nothing to stop later builders (unlike my comments said) and poluted the workspace log with worthless messages. Change-Id: Ib954beb9674f1387c022f926388adb8faf6cdac2
* Refactor aidl handling in its own class.Xavier Ducrohet2011-01-3013-0/+264
| | | | | | | It extends a new base class that will serve as a base class for the one handling renderscript files. Change-Id: Ibef0c4b9a792fe52bf7b70bf5d24f76a15cb65c9
* ADT: Support class folders during build.Xavier Ducrohet2011-01-2510-0/+111
| | | | Change-Id: If1d6840082f96dd98c8be0658c6ce157b4801bd3
* Update test project with java dependency.Xavier Ducrohet2011-01-162-3/+35
| | | | | | | | The android project now has a custom view that depends on a class in the referenced Java project. Change-Id: I59db9dd3b771731e8bd30f9da8072755eee3ce96
* Improve test apps to make them easier to use.Xavier Ducrohet2010-12-0712-27/+47
| | | | | | | Each app now properly reference its name in layout output and in launcher activities. Change-Id: If404b61afc4eb193b01c2b4f8ef44194f5726d93
* Fix test apps using a libraryXavier Ducrohet2010-12-072-1/+5
| | | | Change-Id: I173e7728db86f01d15067555b936e90c4687347d
* New test project for Eclipse: referencing java projects.Xavier Ducrohet2010-12-0613-0/+140
| | | | Change-Id: I4ac4f89ad4c40c0073d7c24662f5a8e8740b696a
* Update test apps and bundle them in the meta sdk.Xavier Ducrohet2010-12-0622-22/+208
| | | | | | | | - make it so that layout display something about the project, and possibly the result of calling out to class coming from jar files. - make the activity names on the launcher to be the name of the projects. Change-Id: I318255c3284337be28220df509630cfff4eae38b
* Use proguard for release builds through Ant.Xavier Ducrohet2010-09-2424-2/+402
| | | | | | | | | | | | | | | This is only activated if default.properties contains a property "proguard.config" with the name of a proguard config file. Some clean-up in the Ant tasks and in the name of the properties used by the rules and the custom tasks to make them clearer. Added a new test app with a project using a jar file as well as a library using a jar file. Change-Id: Ia8f4d873025993d454c0a484e61d47ae679ea79c
* New extension points for DDMSXavier Ducrohet2010-09-071-1/+1
| | | | | | | | | | debugger connector is used by the "debug running app" button in the device list view. source revealer is used by the thread panel when double clicking on an entry of the stack trace. Change-Id: Ida07617a24d37f1d769d86859fd35d5bb19f5fd2
* Simplify icons in test apps.Xavier Ducrohet2010-09-026-0/+0
| | | | Change-Id: I9dad8dc30e0fa2499c9b003abbe08d91dc4041ab
* New test projects.Xavier Ducrohet2010-09-0220-10/+300
| | | | | | | Also fixed some trailing space in templates and automatically generated files. Change-Id: I2ed5f0067dff4c62b53857b7e0a2dea5dd9a101c
* ADT: Make release and debug builds really different.Xavier Ducrohet2010-09-0114-0/+209
Release export should not be debug builds that are stripped of their signature and (optionnaly) resigned. Instead they should actually build the apk in "release" mode. Refactor PostCompilerHelper to be easier to use for export feature (moved all error handling into the actual IncrementalBuilder since we don't want the helper to put error/warning marker during release export). Update the API of ApkBuilder and PostCompilerHelper to deal better with signing key: - option to package with a "sign with debug" flag. - new option to package/sign with given keys. Debug build (through incremental builder) use the new aapt option --debug-mode that automatically insert debuggable=true in the manifest. This allows for the same source code to generate debug and release builds. Currently, only the "export unsigned release apk" action use the new "release" build. Need to update the export wizard. Also need to add support for this in Ant. New folder in sdk.git/testapps for test projects to be used in upcoming automated build tests. Simple "basicProject" to start with. Change-Id: I3041312bc817153603656de2aa355f8fcaf00b5b
generated by cgit v1.1 at 2024-05-24 15:37:57 +0000