aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-11-19Update rsSupportMode buildTest to 18.1.1 fromSteve Moyer
18.1.0 to fix broken test on windows Change-Id: Ieb09476ec71778be1cfb92ba35afdc6b221b5897
2013-11-19Merge "Move to Gradle 1.9"Xavier Ducrohet
2013-11-19Move to Gradle 1.9Xavier Ducrohet
Change-Id: I71163cdbf756d2e4699b00f03805e6db1016e198
2013-11-15Merge "Support to test proguarded apps."Xavier Ducrohet
2013-11-15Support to test proguarded apps.Xavier Ducrohet
Change-Id: I4cce4479c6c3e7e5e56bfe346e85ff32b486dbd3
2013-11-15Merge "Add support for APP_STL"Xavier Ducrohet
2013-11-14Add support for APP_STLXavier Ducrohet
Change-Id: I2cc3035a8cc8b5a6426bf79ce61311ca0f854d81
2013-11-14Merge "Support for jni lib in library project."Xavier Ducrohet
2013-11-14Support for jni lib in library project.Xavier Ducrohet
Change-Id: I5598af8cb6300ffd67ea6f112a6868c338c8efbe
2013-11-14Merge "Remove obsolete makefile."Xavier Ducrohet
2013-11-14Remove obsolete makefile.Xavier Ducrohet
Change-Id: I4f9ace257362e65ff734828779edbf58534d9dff
2013-11-14Merge "Update version to 0.7.0"Xavier Ducrohet
2013-11-14Update version to 0.7.0Xavier Ducrohet
Change-Id: Ie2de7ec0fd043218a3018859e65e69246515424d
2013-11-14Merge changes If469c1ed,Ib34a975cXavier Ducrohet
* changes: Renderscript Support Mode. NDK Integration first pass.
2013-11-13Renderscript Support Mode.Xavier Ducrohet
Change-Id: If469c1edc5f38671cdebc5271b14a2e1b908f428
2013-11-13NDK Integration first pass.Xavier Ducrohet
Change-Id: Ib34a975c5bbbc559fc20f3b582566e7e3d69044b
2013-11-12Merge "Remove obsolete class."Xavier Ducrohet
2013-11-12Remove obsolete class.Xavier Ducrohet
Change-Id: I95c81b9cc55f89e714f1639188741833779d9d9b
2013-11-12Merge "Move to Proguard 4.10"Xavier Ducrohet
2013-11-08Move to Proguard 4.10Xavier Ducrohet
Change-Id: I9410c371627faca9cb76df2b5306c37dc41dd2fb
2013-11-09Merge "Updated changelog."Alex Ruiz
2013-11-08Updated changelog.Alex Ruiz
Change-Id: I7273fe040c8bb17ceb9f25c1d6b2292956dea501
2013-11-08Merge "Switch to the Gradle input file detection mechanism."Xavier Ducrohet
2013-11-07Switch to the Gradle input file detection mechanism.Xavier Ducrohet
Change-Id: Id054d857e64a0fe7620e3b80ae8d44f8e7ce3d90
2013-11-06Merge "Fix import paths in tests so that they work in the IDE"Siva Velusamy
2013-11-06Merge "Added more instrumentation option"Xavier Ducrohet
2013-11-06Merge "Misc fixes."Xavier Ducrohet
2013-11-05Misc fixes.Xavier Ducrohet
Change-Id: I9232d9a9b0a1e6f8650d9f18ffc45d8f6d8c3d41
2013-11-06Merge "Revert "Disabled test that does not run on CI server or workstation.""Xavier Ducrohet
2013-11-05Revert "Disabled test that does not run on CI server or workstation."Xavier Ducrohet
This reverts commit f695a7d3cfa35c0fcfa4cf0c14d71fcf3f22aca7.
2013-11-06Merge "Config the VM to use more RAM in order to be able to run the tests."Xavier Ducrohet
2013-11-05Config the VM to use more RAM in order to be able to run the tests.Xavier Ducrohet
Change-Id: Ifc9234d7c92ffbdc103d51c00be2a865d1a23cf0
2013-11-05Fix import paths in tests so that they work in the IDESiva Velusamy
Change-Id: Ie5cdb99025466f1bd50ec6aee793aa92f4c5c5de
2013-11-03Merge "Revert "0.6.3: Depend on tools/base 22.2.1""Alex Ruiz
2013-11-03Revert "0.6.3: Depend on tools/base 22.2.1"Alex Ruiz
This reverts commit 0f2bfcd41d2342495aeae9aee100e39ed3861eeb. Change-Id: I40ada0ac04ffaf07dbb92bffeb9dd4ce5e422c5d
2013-11-03Merge "0.6.3: Depend on tools/base 22.2.1"Alex Ruiz
2013-11-030.6.3: Depend on tools/base 22.2.1Tor Norbye
Change-Id: I15ae73b2ca9d0bf262ac59282ac4545e5f148564
2013-10-31Added more instrumentation optionAlan Jeon
Now, we can set handleProfiling and functionalTest option to test manifest file when we run instrumentTest. defaultConfig { minSdkVersion 8 targetSdkVersion 16 testHandlingProfiling true testFunctionalTest true } These options are described at: https://developer.android.com/guide/topics/manifest/instrumentation-element.html Change-Id: I7c03684c03fe64fd5c33555b32c7bfd683d4e47e Signed-off-by: Alan Jeon <skyisle@gmail.com>
2013-10-14Merge "Improve resource merging error handling"Tor Norbye
2013-10-14Improve resource merging error handlingTor Norbye
This changeset tracks changes in sdk-common to throw MergingExceptions when there is a problem with resoure merging (XML errors, duplicate errors, file access errors, invalid file name errors, and so on). It catches these and emits the errors (which provide a format easily parseable in IDEs, always including the filename, line number, and column if available, etc). Change-Id: Ic6b92e55459e5ef6dc7ddbaf83ffc82983c0d3b1
2013-10-11Merge "Revert "Added more options for dependency resolution.""Alex Ruiz
2013-10-11Revert "Added more options for dependency resolution."Alex Ruiz
With the latest changes in dependency resolution in Studio itself, it is no longer necessary to have the 3-state system property. Reference: https://android-review.googlesource.com/67875 This reverts commit 7472d12db00e2f8325633efa96d2e0982382fda6. Change-Id: Iec6315305c48f4089fd0b0364be75fd91d71c26e
2013-10-10Merge "Updated plug-in version to 0.6.2"Alex Ruiz
2013-10-10Merge "Added more options for dependency resolution."Alex Ruiz
2013-10-10Updated plug-in version to 0.6.2Alex Ruiz
Change-Id: I3c8ac610467092da38389339bb9fa284430ec79b
2013-10-10Added more options for dependency resolution.Alex Ruiz
Dependency resolution is driven by the value of the system property "android.build.model.only": 1. null (system property not specified): resolve dependencies and fail if there are unresolved ones. This is the default option and it is used when building a project either from command line or Android Studio. 2. 'true': don't resolve dependencies. This option is used when importing source code into an IDE regardless dependencies can be resolved or not. 3. 'false': resolve dependencies but do not fail if there are unresolved ones. This option is used after option #2 has been used to get the source in the IDE, to get dependencies set up in the project. In a future CL I'm going to replace this system property with types (interfaces) that indicate the option to use. This is necessary to ensure we use only one daemon for importing and building projects. Change-Id: Ic63ab27b8304f0facb64e2cdb1d74749a2808a69
2013-10-04Merge "Make lint task use the plugin's SDK home, not environment"Tor Norbye
2013-10-04Merge "Tweak the user message for the 1.8 gradle dependency"Tor Norbye
2013-10-04Tweak the user message for the 1.8 gradle dependencyTor Norbye
Change-Id: I348eb7b33de55f20d89dbb06c209645aabf52463
2013-10-03Make lint task use the plugin's SDK home, not environmentTor Norbye
This makes the lint task pick up the SDK configured in local.properties, rather than just relying on $ANDROID_HOME. Also cleans up the Lint task such that it only performs work when the lint task is actually *run*, not just constructed (which will happen at every startup, for every variant -- not just when you're runnign lint). This is also important since it used to actually perform output file validation such as deleting the previous contents, which it should only do when you're actually running lint. Change-Id: I46224e7f6e558e88653fcef711581d302c1adfc5
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-18 09:22:32 +0000