aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-12-24Merge "Add core-oj to the list of dependencies"android-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-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_r1nougat-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-dr1-releasenougat-devNarayan Kamath
am: 3d48bd3d08 * commit '3d48bd3d08a433fda3135a6ab4fbf8803e9c50b3': Add core-oj to the list of dependencies
2015-12-24Merge "Add core-oj to the list of dependencies"android-n-preview-2android-n-preview-1Narayan Kamath
2015-12-22Add core-oj to the list of dependenciesPrzemyslaw Szczepaniak
(cherry picked from commit 5b903deb74ff89bdff3856a317c87999417ec89a) Change-Id: I13aaf3be811773377b652adb263a0be5465e8f4b
2015-11-19Add core-oj to the list of dependenciesPrzemyslaw Szczepaniak
Change-Id: I99a3f78254051244cfffc9f4e40b6d2a03306403
2015-10-27Merge "Move makefile comment to separate line" am: 3d960ddd27Colin Cross
am: 48612f9cb6 * commit '48612f9cb61795627aea54e7b66a12d9a457fa9a': Move makefile comment to separate line
2015-10-27Merge "Move makefile comment to separate line"Colin Cross
am: 3d960ddd27 * commit '3d960ddd27db18a8570e6755956fd96b82860da7': Move makefile comment to separate line
2015-10-27Merge "Move makefile comment to separate line"Colin Cross
2015-10-26Move makefile comment to separate lineColin Cross
One of the wonderful vagaries of GNU make is that adding a comment at the end of an assignment will cause any trailing spaces before the comment to end up in the variable. This will cause problems if that variable is later used as part of something that expects a single word, such as ifdef. Move the comment to the line above the assignment. Change-Id: Idfa6c28c4941cd565e96b229c2eec9bb915d37ed
2015-08-27am 7d2e72ef: am 69c74c2d: (-s ours) am 901b8ca0: Merge "Add host target to ↵Kenny Root
support vogar-run tests" * commit '7d2e72efe052f7db8bf3b994723422aabb112442':
2015-08-27am 69c74c2d: (-s ours) am 901b8ca0: Merge "Add host target to support ↵Kenny Root
vogar-run tests" * commit '69c74c2dc23842391c879429b3463f318d92c4b9':
2015-07-30Merge "package version metadata for external/"Bill Napier
2015-07-24am 901b8ca0: Merge "Add host target to support vogar-run tests"Kenny Root
* commit '901b8ca001d97d55f55464a7647d3c264221526c': Add host target to support vogar-run tests
2015-07-24am 901b8ca0: Merge "Add host target to support vogar-run tests"Kenny Root
* commit '901b8ca001d97d55f55464a7647d3c264221526c': Add host target to support vogar-run tests
2015-07-24Merge "Add host target to support vogar-run tests"android-m-preview-2Kenny Root
2015-07-24Add host target to support vogar-run testsKenny Root
Change-Id: I3e66c23571062d154d6ef02939a7c3e7941f1dbd
2015-06-02package version metadata for external/Damien Miller
This will be used for automated notification of external vulnerability reports. Change-Id: Ic35c3069323fb7988a0f1ed15497af4c8601e9fe
2015-03-31am 1da2494f: Merge "Remove copied reference to undefined local_javac_flags"android-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_r1afw-test-harness-1.5marshmallow-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-releaseandroid-live-tvColin Cross
* commit '1da2494f7a98a8e85c9115fb012b798c9facc68f': Remove copied reference to undefined local_javac_flags
2015-03-31Merge "Remove copied reference to undefined local_javac_flags"android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-1android-m-previewColin Cross
2015-03-30Remove copied reference to undefined local_javac_flagsColin Cross
Change-Id: I481ad579c43970d01bba61c994173fe3440f42de
2015-01-23am 0746ec10: Merge "Don\'t build junit-hostdex and core-junit-hostdex on mac ↵Elliott Hughes
os." * commit '0746ec10aedbab904947482ef19bae2c7ee7b205': Don't build junit-hostdex and core-junit-hostdex on mac os.
2015-01-22Don't build junit-hostdex and core-junit-hostdex on mac os.Narayan Kamath
They depend on core-libart-hostdex, which isn't built on that platform. (cherry picked from commit b9ba574505d3ae4540f43d6100356c738bd9eef0) Change-Id: Icd6a83c0c3c8519819f304c70724552c327e064c
2015-01-21Merge "Don't build junit-hostdex and core-junit-hostdex on mac os."Elliott Hughes
2015-01-21Don't build junit-hostdex and core-junit-hostdex on mac os.Narayan Kamath
They depend on core-libart-hostdex, which isn't built on that platform. Change-Id: I63246f62b36263a5f9fc07e02e9bf0f227d7d63c
2014-08-26more graceful way to build Junit with dependencies from prebuiltsNick Korostelev
Change-Id: I127ddf1df97c14855196c18ccb7a69fbdc237c7d
2014-08-08Introduced the ability to reference Junit build with dependencies from prebuiltsNick Korostelev
Workaround until all unbundled buids switch to using prebuilts Change-Id: Ie6339f978846a861b78922903c555fd931701a67
2014-07-15Revert "Switched gradle Hamcrest dependency to use prebuilts version"Justin Morey
This reverts commit 8e713340c732b1b0c7b6712578dd8462ad2d1002. Change-Id: Ica78e3b4931f3e4564ce14ba58c0ca58bba7842a
2014-07-14Switched gradle Hamcrest dependency to use prebuilts versionNick Korostelev
to allow Gradle resolve conflicting dependencies and avoid multi dex errors. Change-Id: I4a5c7f19d2d7c1707c186579abdd303d9e715f94
2014-06-19am 1a848650: am 8f312e0c: Merge "Switch from core to core-libart"android-wear-5.0.0_r1android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releaseandroid-live-tv-l-mr1Brian Carlstrom
* commit '1a8486507e3feb42078ca2581404700a65110f0a': Switch from core to core-libart
2014-06-19am 8f312e0c: Merge "Switch from core to core-libart"Brian Carlstrom
* commit '8f312e0c3d6dff30d015d2c85fdaae0a39220fd6': Switch from core to core-libart
2014-06-19Merge "Switch from core to core-libart"android-l-preview_r2l-previewBrian Carlstrom
2014-06-18Switch from core to core-libartBrian Carlstrom
Bug: 14298175 Change-Id: I1bb8f393d6da44ce58b117fbdadb5ce37b60315a
2014-06-11am 101f6aa7: am 2d073283: Merge "Remove deprecated WITH_HOST_DALVIK."Ian Rogers
* commit '101f6aa764e3520f85d807ddd9b5348711d84444': Remove deprecated WITH_HOST_DALVIK.
2014-06-11Tweak the way compile dependencies for junit configurations are exportedJustin Morey
Change-Id: Ib20e9a3ca1606747412e9eb30c5d28142835064f
2014-06-10am 2d073283: Merge "Remove deprecated WITH_HOST_DALVIK."Ian Rogers
* commit '2d073283b1a100d81b72cdbf07e898c5478bc3e0': Remove deprecated WITH_HOST_DALVIK.
2014-06-10Merge "Remove deprecated WITH_HOST_DALVIK."Ian Rogers
2014-06-08Remove deprecated WITH_HOST_DALVIK.Ian Rogers
Bug: 13751317 Change-Id: Ia6d07d421c34aedd9ffc85306ba7188186a60c3e
2014-05-02Add a host gradle build for junit.Jon Boekenoogen
Change-Id: I6dbf31c007c5dbbab62b9b53b7ab32d50592a12f
2014-04-30Omit junit.runner and junit.textui from junit gradle build.Brett Chabot
These packages are included in the system android.test.runner, and proguard complains if they are included in an apk. Bug: 14417748 Change-Id: I9f20a4e793f1dd015d1fb6cccf16c40197e501b7
2014-03-17Give gradle projects more human-friendly namesJustin Morey
This simplifies tapas support, and should make working with GmsCore in Android Studio easier Change-Id: I95110532083b0b9fa2d9ed29a6a4c41eb9611d2a
2014-03-05Preparing to add GmsCore automated tests to Gradle buildJustin Morey
Change-Id: I7fcde1dc2a783fd3056194c74852a221115d10d2
2014-01-21Undo modifications of JUnit38ClassRunner.Brett Chabot
Instead will look for ways to make dependent libraries work with current version of upstream junit. Bug: 10749552 Change-Id: I046ba0fa78bc3b3286cb2e27693bfb4ec5780dfc
2014-01-17am a5f8e718: Merge "DO NOT MERGE. Cherry pick \'Handle case where filter has ↵Brett Chabot
removed all methods in TestSuite.\'" into klp-modular-dev * commit 'a5f8e718d5e8ce24b2ba0060058ec2e9e8ca962e': DO NOT MERGE. Cherry pick 'Handle case where filter has removed all methods in TestSuite.'
2014-01-17am 53565f5d: DO NOT MERGE. Cherry pick \'Evaulate annotations for superclass ↵Brett Chabot
test methods.\' * commit '53565f5dd58e90677b0be6fa1801830bcb56be47': DO NOT MERGE. Cherry pick 'Evaulate annotations for superclass test methods.'
2014-01-17Merge "DO NOT MERGE. Cherry pick 'Handle case where filter has removed all ↵Brett Chabot
methods in TestSuite.'" into klp-modular-dev
2014-01-16DO NOT MERGE. Cherry pick 'Handle case where filter has removed all methods ↵Brett Chabot
in TestSuite.' Before this change, description.testCount() would count methods which should be removed by intersection of filters. Change-Id: Iea8dcebedd2c4061d52317457b739813d499ff69 (cherry picked from commit 5f4c76c6e54fd8f96cb1f7bc923adbe81bdaf953)
2014-01-16DO NOT MERGE. Cherry pick 'Evaulate annotations for superclass test methods.'Brett Chabot
Class.getDeclaredMethod was being used to retrieve annotation info on JUnit3 classes. This does not work when test methodis from super class. Change the code to use getMethod instead. Change-Id: I647b484b374dfc76dc3764593016921209f1ac5d (cherry picked from commit 7b1b6e51b3ff20215d7ca4fc6367829cb6021438)
2013-12-05am 9d96ec47: Merge "Better way to export variables in Common.mk"Ying Wang
* commit '9d96ec477b50480702d8d7167d0bfb391147878d': Better way to export variables in Common.mk
2013-12-05Merge "Better way to export variables in Common.mk"idea133-weekly-releaseidea133Ying Wang
2013-12-04Better way to export variables in Common.mkYing Wang
With this change, variables in Common.mk will be evaluated only once. As a side effect, this fixes the build log spam reported in: https://code.google.com/p/android/issues/detail?id=63184 Change-Id: Ifb9898c1d720eb49b8d7be591c2eb5eff502887f
2013-12-04Better way to export variables in Common.mkYing Wang
With this change, variables in Common.mk will be evaluated only once. As a side effect, this fixes the build log spam reported in: https://code.google.com/p/android/issues/detail?id=63184 Change-Id: Ifb9898c1d720eb49b8d7be591c2eb5eff502887f
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 08:23:44 +0000