aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-06-15Merge "Add OWNERS in external/droiddriver"android-o-preview-4android-o-iot-preview-5o-iot-preview-5Chih-hung Hsieh
2017-06-05Add OWNERS in external/droiddriverChih-Hung Hsieh
* Owners are selected from top CL approvals or owners. They will be suggested to review/approve future CLs. * OWNERS files are recognized by the new find-owners plugin, see .md files in https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/ Test: build/make/tools/checkowners.py -c -v OWNERS Change-Id: I9408ec0a9367e5feda48217a3ab650c8b916b8b5
2016-10-24Merge "Revert "Fix code for more restrictive compiler [options]"" am: ↵android-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2android-n-iot-preview-4n-iot-preview-4Paul Duffin
4138eed6f4 am: ea213ab0d2 am: 87d17d0acd Change-Id: I706602375cc670ba531db6ab5b4446be1fae5b2f
2016-10-24Merge "Revert "Fix code for more restrictive compiler [options]"" am: 4138eed6f4Paul Duffin
am: ea213ab0d2 Change-Id: Id066ec453d869b538ffa2324e6ffbb28e3edbdeb
2016-10-24Merge "Revert "Fix code for more restrictive compiler [options]""android-o-preview-1android-n-mr2-preview-2android-n-mr2-preview-1o-previewPaul Duffin
am: 4138eed6f4 Change-Id: Ic7e4a2e8a8096288980091a7a47af4ebd5463c0f
2016-10-24Merge "Revert "Fix code for more restrictive compiler [options]""Paul Duffin
2016-10-24Revert "Fix code for more restrictive compiler [options]"Paul Duffin
This reverts commit 86fa19c2157314b5a303c5540f0f60cc8c7862cd. Test: Rebuilt Change-Id: If47d182a98a6a5bb97477edbd1b62e99a578d851
2016-10-24Merge "Fix code for more restrictive compiler [options] ------------- ↵Paul Duffin
Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=116809572" am: 127f6303bd am: 7ca70d735d am: 2ea231fcde Change-Id: I616549336ae0603da8d28980116e5da8b487d134
2016-10-24Merge "Fix code for more restrictive compiler [options] ------------- ↵Paul Duffin
Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=116809572" am: 127f6303bd am: 7ca70d735d Change-Id: I5e9bb8e5056890954c905abdd3302414a959394b
2016-10-24Merge "Fix code for more restrictive compiler [options] ------------- ↵Paul Duffin
Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=116809572" am: 127f6303bd Change-Id: Ia8f2e9ba8e1a244a2fc08b7225945480671f52ab
2016-10-24Merge "Fix code for more restrictive compiler [options] ------------- ↵Paul Duffin
Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=116809572"
2016-10-18Fix code for more restrictive compiler [options]kjin
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=116809572 (cherry picked from commit 04be547623ae035113c42565423b28bac425f889) Test: Build using Error Prone which fails without this patch Change-Id: I4e5925d9b8b8652d9eb3d155b9113be5dca4e35f
2016-01-06Updated android maven pluginandroid-n-mr1-preview-2android-n-mr1-preview-1android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-mr0.5-releasenougat-dr1-releasenougat-devnougat-cts-releasenougat-bugfix-releaseEric Fitchett
The older plugin is incompatible with newer releases of gradle. Newer gradle compatibility is required for DroidDriver to be built as a subproject of projects that require a newer version of gradle. com.github.dcendents:android-maven-plugin:1.2 is compatible with gradle version n where 2.2 <= n < 2.4 com.github.dcendents:android-maven-gradle-plugin:1.3 is compatible with gradle 2.4+ Change-Id: I42079dc0da92188b0258179fc7ca5ce0dc9a49fc
2015-08-05resolved conflicts for merge of 72a40802 to masterGuang Zhu
Change-Id: Ic8aa08be037b02c5b447c9a7e3dd8debc33ccd65
2015-08-05follow AndroidJUnitRunner API changeandroid-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-preview-1android-n-iot-preview-2android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1nougat-mr1-wear-releasen-iot-preview-2marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releaseGuang Zhu
Change-Id: If4c92eb450f20e3ededcab64966598b697f50ed6
2015-04-30Fix build breakage due to ag/678753Nick Korostelev
Change-Id: I39682adf6fe9fc6f1382b1ab4b9596388d6cb9fb
2015-03-30am c1f89919: Merge "Update pom to comply with maven central requirements"Kevin Jin
* commit 'c1f89919ed5e88650548f34fe8ca9e5d458a41df': Update pom to comply with maven central requirements
2015-03-30Merge "Update pom to comply with maven central requirements"android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-2android-m-preview-1android-m-previewmaster-soongKevin Jin
2015-03-28Update pom to comply with maven central requirementsbootstraponline
Change-Id: I385b254cef793ce7c3046764564be3cf1ec1a4d6
2015-03-18am 264cea53: Merge "Add NOTICE and MODULE_LICENSE files"Conley Owens
* commit '264cea5323e927fda75f926a468fad801c653029': Add NOTICE and MODULE_LICENSE files
2015-03-18Merge "Add NOTICE and MODULE_LICENSE files"Conley Owens
2015-03-13am dfb7bd50: Merge "Add CloseKeyboardAction for InstrumentationDriver"Kevin Jin
* commit 'dfb7bd50344340bf195ad3ba1f7b33ff2957271a': Add CloseKeyboardAction for InstrumentationDriver
2015-03-13am 10e9cfd4: Merge "Enable bintray auth via env"Kevin Jin
* commit '10e9cfd437860ad3013262c33d4b452853dfb5f5': Enable bintray auth via env
2015-03-13Merge "Add CloseKeyboardAction for InstrumentationDriver"Kevin Jin
2015-03-13Merge "Enable bintray auth via env"Kevin Jin
2015-03-13Add CloseKeyboardAction for InstrumentationDriverKevin Jin
Change-Id: I10c0d9cd8c88ccf88f1798a9b0daf7cc8ed796ad
2015-03-13Enable bintray auth via envbootstraponline
Change-Id: Iab0ce245e460691c6ec4869ac8b328abb66c9b7b
2015-03-13am 040e46c3: Merge "Fix artifactory snapshots"Kevin Jin
* commit '040e46c3cc80de8eb21166f912e074a8b94c147f': Fix artifactory snapshots
2015-03-12Add NOTICE and MODULE_LICENSE filesConley Owens
Change-Id: I66c429e50797222582b72ac4273c64914bd32f85
2015-03-12Merge "Fix artifactory snapshots"Kevin Jin
2015-03-12Fix artifactory snapshotsbootstraponline
Change-Id: I3e1557ce61cd5b98258bdfcafc550eeba3aa3ea9
2015-03-11am 05fe364c: am da796210: Merge "Use droiddriver:1.0.0-SNAPSHOT to build ↵Kevin Jin
droiddriver-android_support_test" * commit '05fe364c3bc2406e8703f69645a1ef8664b2b4ee': Use droiddriver:1.0.0-SNAPSHOT to build droiddriver-android_support_test
2015-03-10am da796210: Merge "Use droiddriver:1.0.0-SNAPSHOT to build ↵Kevin Jin
droiddriver-android_support_test" * commit 'da796210064680bc4f2eac51a90d29cde95c757c': Use droiddriver:1.0.0-SNAPSHOT to build droiddriver-android_support_test
2015-03-10Merge "Use droiddriver:1.0.0-SNAPSHOT to build droiddriver-android_support_test"Kevin Jin
2015-03-10am c2bbac30: am 4a662771: Merge "Use project properties to authenticate with ↵Kevin Jin
JCenter" * commit 'c2bbac30b57b06521c1c9bea0e66976f611e475e': Use project properties to authenticate with JCenter
2015-03-10Use droiddriver:1.0.0-SNAPSHOT to build droiddriver-android_support_testKevin Jin
Change-Id: I8528969f7f7d8c64a929d5a9b295967e94eab67c
2015-03-09am 4a662771: Merge "Use project properties to authenticate with JCenter"Kevin Jin
* commit '4a662771b825241a670a3ba2ef6f4c877c5b92d5': Use project properties to authenticate with JCenter
2015-03-09Merge "Use project properties to authenticate with JCenter"Kevin Jin
2015-03-09Use project properties to authenticate with JCenterbootstraponline
This improves Jenkins integration as the API key is not exposed to the filesystem. Change-Id: Ia7b8d3df2a481aefa0a2507dd6b6d7a4fe249f4a
2015-03-08am 816720b8: am b9cf8750: Merge "runOnMainSync on a single thread"Kevin Jin
* commit '816720b8489b922f4bfcee892218e8c81b1359e4': runOnMainSync on a single thread
2015-03-08am d28ce609: am b284da94: Merge "Add InstrumentationUtils"Kevin Jin
* commit 'd28ce609c219a47f9b1a7434fcb667ece929482d': Add InstrumentationUtils
2015-03-06am b9cf8750: Merge "runOnMainSync on a single thread"Kevin Jin
* commit 'b9cf8750ebf4394555f9ef801b2114d4901682a5': runOnMainSync on a single thread
2015-03-06Merge "runOnMainSync on a single thread"Kevin Jin
2015-03-06runOnMainSync on a single threadKevin Jin
Add DroidDriverException.propagate Change-Id: I7bdcbe1642b4448cc40a06995950573ebd890b4f
2015-03-06am b284da94: Merge "Add InstrumentationUtils"Kevin Jin
* commit 'b284da9483474581abc25a8cc822b4dadf2dfa34': Add InstrumentationUtils
2015-03-06Merge "Add InstrumentationUtils"Kevin Jin
2015-03-05Add InstrumentationUtilsKevin Jin
Move runOnMainSyncWithTimeout to InstrumentationUtils Add By.resourceId(int) since InstrumentationUtils should always be available Change-Id: I8e4683030583b88c3e2b777d0b80b5a2f310e279
2015-03-05am 3c34ee0c: am f2c56347: Merge "Add droiddriver-android_support_test"Kevin Jin
* commit '3c34ee0c7e6a74c37483c4e0fdd3691e639cc8c2': Add droiddriver-android_support_test
2015-03-05am f2c56347: Merge "Add droiddriver-android_support_test"Kevin Jin
* commit 'f2c5634785d05fbdaff81a8b5f781910dd7a2894': Add droiddriver-android_support_test
2015-03-05Merge "Add droiddriver-android_support_test"Kevin Jin
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 05:13:17 +0000