aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterandroid-r-beta-3android-r-beta-2Xin Li
Bug: 151763422 Change-Id: I90ceed751b71f241837e51241bdc64d1cb394da5
2020-03-30Snap for 6347427 from f44b4add243846b6bd3dc18a77ec8ee12275e262 to ↵android-build-prod (mdb)
simpleperf-release Change-Id: Ie29fbde3b5a490d9a4b5777ceacc27d9f1adc262
2020-03-26Remove redundant NOTICE symbolic link. am: f44b4add24 am: c3cb43c6f5 am: ↵Bob Badour
2b5f305ec7 am: f6f982ad09 am: 4086051c3b Change-Id: I3886b50297e4f3030b5f3a3802980396037794a5
2020-03-26Remove redundant NOTICE symbolic link. am: f44b4add24 am: c3cb43c6f5 am: ↵Bob Badour
2b5f305ec7 am: f6f982ad09 Change-Id: I8280cbe23eaee1b4ef9a644b0397b4af7f90015a
2020-03-26Remove redundant NOTICE symbolic link. am: f44b4add24 am: c3cb43c6f5 am: ↵Bob Badour
2b5f305ec7 Change-Id: Ia82724875b5fc40f7e2f8cdd87dbd29ad865f363
2020-03-26Remove redundant NOTICE symbolic link. am: f44b4add24 am: c3cb43c6f5Bob Badour
Change-Id: Ic859289bf68453b19c322e918521478a33910e52
2020-03-26Remove redundant NOTICE symbolic link. am: f44b4add24 am: c3cb43c6f5Bob Badour
Change-Id: If21f2aa654f8a12f3a843c2b47b58081874e3c6d
2020-03-26Remove redundant NOTICE symbolic link. am: f44b4add24Bob Badour
Change-Id: Ia2f65f6629e5e6fbd33ff657d4b630fc3cb93365
2020-03-25Remove redundant NOTICE symbolic link.Bob Badour
Now that http://aosp/1235427 and http://aosp/1238719 are in, NOTICE symbolic links are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: I3982a9ac7897049691655108562033d4fd401c7f
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: fea6802d1b -s ours am: 80299ec761 am: 0cf8891a31 am: 44e7d9f839 -s ours am skip reason: subject contains skip directive Change-Id: I317314a551386c8f004ea67d564f2cbff9c319ef
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: fea6802d1b -s ours am: 80299ec761 am: 0cf8891a31 Change-Id: Iad3cabe0d6206cce68e62e1b119ea39cf341ec49
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: fea6802d1b -s ours am: 80299ec761 Change-Id: Ie73df7cba440cb1f4c64300433322c72577618bf
2020-03-19DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stag-aosp-master am: fea6802d1b Change-Id: Ifda49979ac055919b331d0acbfd6630fc202a88b
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: fea6802d1b -s ours am skip reason: subject contains skip directive Change-Id: I3198800b0642a75345b84792d19d21eb5530f717
2020-03-18DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I7229dcfc6af94c2a8fd460bcd95337ad4d0b1544
2020-03-05Initial merge with upstream am: cef92d673c am: c5f71e95df am: e50b3b7561 am: ↵Automerger Merge Worker
c47b5481de am: 089373269b Change-Id: I00caf048ac2f81928690feb6ce0c26274339e84a
2020-03-05Initial merge with upstream am: cef92d673c am: c5f71e95df am: e50b3b7561 am: ↵Automerger Merge Worker
c47b5481de Change-Id: I60cd10aaa1168a8cce849ed224868bd4e5463123
2020-03-05Initial merge with upstream am: cef92d673c am: c5f71e95df am: e50b3b7561Automerger Merge Worker
Change-Id: I9a53b224c320efb500d8a33b41798dd4df5fc78f
2020-03-05Initial merge with upstream am: cef92d673c am: c5f71e95dfAutomerger Merge Worker
Change-Id: I8cb86c1ef1be53141ae974516ff4dcde25e8165a
2020-03-05Initial merge with upstream am: cef92d673c am: c5f71e95dfAutomerger Merge Worker
Change-Id: I78d1f8b680646deee89918ad5ff43a8615945c35
2020-03-05Initial merge with upstream am: cef92d673cAutomerger Merge Worker
Change-Id: Ic4daadc9eb65c5d1f06d8cd6e1d975523371e9d3
2020-03-05Initial merge with upstreamandroid-r-preview-4android-r-preview-3android-r-preview-2Yuexi Ma
Test: n/a Bug: 150784654 Change-Id: I6fb223f1bd657a6a3d0be1492f63a7774e21943e
2020-03-04Initial empty repositoryInna Palant
2019-11-14Fix 1 ErrorProneStyle finding:clshepherd
* Constructors and methods with the same name should appear sequentially with no other code in between. Please re-order or re-name methods. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=280437487
2019-11-06fix Handler.getHostAddress() performance issueasie
Fixes #85 RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=278648767
2019-10-14Fix 6 ErrorProneStyle findings:clshepherd
* Constructors and methods with the same name should appear sequentially with no other code in between. Please re-order or re-name methods. * Use grouping parenthesis to make the operator precedence explicit ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=274188261
2019-10-04Run Maven tests for jimfs in our internal builds.cpovirk
Hopefully this will catch future breakages. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=272969420
2019-10-04Change Jimfs PathMatchers to use the regex flags indicated by the ↵cgdecker
Configuration's canonical (rather than display) path normalization when the Configuration is set to use canonical normalization for path equality. This basically affects Windows-like configurations, as Windows/NTFS is the only file system (at least of those Jimfs has a built-in equivalent for) that uses these settings. Essentially, Windows does not normalize the case of file names when displaying paths but it does normalize them (case fold) for comparison and equality. On a real Windows file system, a PathMatcher for "glob:**.txt" or "glob:**.TXT" would match both files ending in ".txt" and files ending in ".TXT". Fixes https://github.com/google/jimfs/issues/91 RELNOTES=Fixed behavior of `PathMatcher`s for Windows-like configurations to do case-insensitive matching. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=272959573
2019-10-04Prepare Javadoc for Java 11, and make other improvements:cpovirk
- Move nearly all Javadoc configuration to the parent POM. - Update Guava and ICU4J link locations. The current links resolve to the Javadoc -- but only after a redirect, which Javadoc doesn't like: https://bugs.openjdk.java.net/browse/JDK-8190312 - Update maven-javadoc-plugin to 3.1.1. (This version knows how to work around the aforementioned redirect problem, should it happen again.) - Add links to Checker Framework. For some reason, this isn't working under Java 11. I haven't investigated. - Disable detectJavaApiLink, and fill in https://docs.oracle.com/javase/9/docs/api/ for Java 8 and https://docs.oracle.com/en/java/javase/11/docs/api/ for newer versions. (I've tested only with Java 8 and 11, so hopefully the "newer versions" behavior is OK for 9 and 10.) It does look like it may be necessary to duplicate all the links in 3 places :\ This is all in service of preventing: [ERROR] Exit code: 1 - javadoc: error - The code being documented uses modules but the packages defined in https://docs.oracle.com/javase/9/docs/api/ are in the unnamed module. Traditionally we solve this problem by setting <source>8</source> on Javadoc (CL 235241314, CL 236159968). That would probably work here, but I've been experimenting with <source>9</source> (for proper modules support in jimfs), so that might not be an option soon. Or maybe it still would be, but I'd have to exclude module-info.java, but then I wonder if that will trigger modules problems? In any case, it seems more future-proof to solve this the right(?) way. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=272937179
2019-10-04Run Error Prone as a plugin.cpovirk
If run in the old style, it uses javac9, which can't handle the Java 11 class files in the JDK11 bootclasspath. This follows the instructions at https://errorprone.info/docs/installation#maven Note also the need to include -Xep:BetaApi:OFF in the same arg as -Xplugin:ErrorProne: https://github.com/google/error-prone/issues/1136#issuecomment-427816741 https://github.com/google/error-prone/pull/1115 (Also, incidentally update Error Prone itself. I forget whether I had a Java-11-related reason for that, but it seems like a good idea.) RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=272934125
2019-10-04maven-compiler-plugin 3.8.1Sean Sullivan
Fixes #90 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=272930832
2019-10-04Travis: use 'openjdk8' instead of 'oraclejdk8'Sean Sullivan
(This now restores coverage for 8, and I made a similar change for 11.) Fixes #89 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=272930783
2019-10-04Use AutoService as a proper annotation processor.cpovirk
I was going to say that this also paves the way for including the annotation as a non-optional dependency, should we wish to follow our Guava precedent for annotations: - https://github.com/google/guava/issues/2824 - https://github.com/google/guava/issues/2721 But I see that it's retention=SOURCE anyway, so there isn't much reason to do that -- except maybe consistency with other annotation packages someday. (Maybe it's still a negative then, as it might still let people rely on our transitive dependency?) I think the relationship of all this to Java 11 was that I might have to set an Automatic-Module-Name on AutoService, and it makes more sense to set it after we've done the processor-vs.-annotation artifact split. Once I was upgrading, it made sense to set up the annotation processor the Right Away, now that we're using a version in which that works. (Or maybe it always worked but now it's nice that it gets the processor off the classpath?) Or maybe there was some other reason for the change to the annotation-processor setup; once again, I forget. It looks like it might have been that AutoService stops running when I switch how we run Error Prone. Hopefully this was the solution :) But it's probably a good idea in any case. This CL is basically following the "alternatively" instructions in https://github.com/google/auto/blob/master/value/userguide/index.md#in-pomxml ...even though the AutoService instructions haven't been similarly updated yet: https://github.com/google/auto/tree/master/service#download ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=272720556
2019-10-04Update versions of some plugins and a dependency to prepare for Java 11.cpovirk
- We may want an ICU4J new enough to contain an Automatic-Module-Name. - Our old maven-surefire-plugin breaks with NullPointerException with JDK10+: https://bugzilla.redhat.com/show_bug.cgi?id=1572708 - Our old maven-compiler-plugin breaks with JDK11: https://github.com/google/error-prone/issues/1136#issuecomment-427816741 (I don't have the error message handy anymore.) RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=272714574
2019-10-04Mostly migrate off jsr305.cpovirk
- Mostly migrate to Checker Framework declaration annotations. - Migrate @GuardedBy to a custom annotation for now. (We would migrate to Error Prone's, but that's causing me problems as I experiment with JPMS.) Compare to b/69411537 for Guava. I've left @ParametersAreNonnullByDefault in place for now, but we'd need to remove it to fully eliminate the jsr305 dep. RELNOTES=Migrated from jsr305 `@Nullable` to Checker Framework `@NullableDecl`. In addition to the new dependency on the Checker Framework annotations, we keep the dependency on jsr305 for now so that we can keep using `@ParametersAreNonNullByDefault`. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=272713254
2019-10-04Update Travis JDK to JDK11.cpovirk
This is an attempt to fix the error: install-jdk.sh 2019-09-17 Expected feature release number in range of 9 to 14, but got: 8 The command "~/bin/install-jdk.sh --target "/home/travis/oraclejdk8" --workspace "/home/travis/.cache/install-jdk" --feature "8" --license "BCL"" failed and exited with 3 during . It is similar to CL 253584474 RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=272528889
2019-10-02Fix exception message - add missing closing parenthesisEvgeny Mandrikov
Fixes https://github.com/google/jimfs/pull/37 RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=272510710
2019-10-02Removed TODO comment for making heap disks configurable, assahmed10315
its already implemented Fixes #36 RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=272432078
2019-06-06Update to Truth 0.45, and address deprecations.cpovirk
Renames may include: - containsAllOf => containsAtLeast - containsAllIn => containsAtLeastElementsIn - isSameAs => isSameInstanceAs - isOrdered => isInOrder - isStrictlyOrdered => isInStrictOrder The other major change is to change custom subjects to extend raw Subject instead of supplying type parameters. The type parameters are being removed from Subject. This CL will temporarily produce rawtypes warnings, which will go away when I remove the type parameters (as soon as this batch of CLs is submitted). Some CLs in this batch also migrate calls away from actualAsString(). Its literal replacement is `"<" + actual + ">"` (unless an object overrides actualCustomStringRepresentation()), but usually I've made a larger change, such as switching from an old-style "Not true that..." failure message to one generated with the Fact API. In that case, the new code usually contains a direct reference to this.actual (a field that I occasionally had to create). Another larger change I sometimes made is to switch from a manual check-and-fail approach to instead use check(...). And sometimes I just remove a withMessage() call that's no longer necessary now that the code uses check(...), or I introduce a check(...) call. (An assertion made with check(...) automatically includes the actual value from the original subject, so there's no need to set it again with withMessage().) Finally, there's one CL in this batch in which I migrate a Correspondence subclass to instead use Correspondence.from. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=251486146
2019-06-06Assert that snapshot elements are ordered, as suggested by the comment.glorioso
RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=250762064
2019-06-06Fix internal build breakage from making assertThat(SortedSet) @GoogleInternal.cpovirk
(https://github.com/google/truth/issues/556) RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=250746093
2019-05-15Migrate users from the old, deprecated Subject.fail* methods to the new ↵cpovirk
Subject.fail* methods or, in some cases, to Subject.check. Most of the changes in this CL were made manually. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=247414164
2019-05-08Instead of calling Subject.actual(), store the actual value in a field, and ↵cpovirk
read that. actual() is being removed. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=247003356
2019-05-07Remove PathSubject.andThat().cgdecker
RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=246869377
2019-05-07Migrate Truth Subjects from no-arg check() to the overload that accepts a ↵cpovirk
description. The overload that accepts a description generally produces better failure messages: - The first line of the message it produces is something like: "value of: myProto.getResponse()" (where "getResponse()" is taken from the provided description) - The last line of the message it produces is something like: "myProto was: response: query was throttled" (the full value of myProto) - And the existing text goes in between. Additional motivation: We are deleting the no-arg overload externally (and probably internally thereafter). ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=246824728
2019-05-05Migrate Truth subjects from the old fail(String, Object) to the new ↵cpovirk
failWithActual(String, Object), tweaking verbs for the new grammar. Before: fail("has foo", expected); After: failWithActual("expected to have foo", expected); ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=246144541
2019-04-29Migrate from assertThat(foo).named("foo") to assertWithMessage("foo").that(foo).cpovirk
(The exact change is slightly different in some cases, like when using custom subjects or check(), but it's always a migration from named(...) to [assert]WithMessage(...).) named(...) is being removed. This CL may slightly modify the failure messages produced, but all the old information will still be present. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=245027649
2019-04-29Migrate from containsAllOf to containsAtLeast.cpovirk
The two behave identically, and containsAllOf is being removed. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=244876613
2019-04-29Update to Truth 0.44.cpovirk
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=244875885
2019-04-29Migrate Truth subjects from a manual "test and fail" approach to one using ↵cpovirk
Subject.check(...). Before: if (actual().foo() != expected) { fail("has foo", expected); } After: check("foo()").that(actual().foo()).isEqualTo(expected); This CL changes the format of the failure message. The new message will typically contain the same information as the old, but if some is missing, let us know, and consider adding a test. The overload of check(...) used by this CL was added in Truth 0.40. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=244408001