From c29e69b8e363cf86dc7a44f766cc4e2fec2b314c Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Sat, 15 Oct 2022 21:33:33 -0700 Subject: Fix errorprone warnings that should be errors This commit is part of a large scale change to fix errorprone errors that have been downgraded to warnings in the android source tree, so that they can be promoted to errors again. The full list of changes include the following, but not all will be present in any one individual commit: BadAnnotationImplementation BadShiftAmount BanJNDI BoxedPrimitiveEquality ComparableType ComplexBooleanConstant CollectionToArraySafeParameter ConditionalExpressionNumericPromotion DangerousLiteralNull DoubleBraceInitialization DurationFrom DurationTemporalUnit EmptyTopLevelDeclaration EqualsNull EqualsReference FormatString FromTemporalAccessor GetClassOnAnnotation GetClassOnClass HashtableContains IdentityBinaryExpression IdentityHashMapBoxing InstantTemporalUnit InvalidTimeZoneID InvalidZoneId IsInstanceIncompatibleType JUnitParameterMethodNotFound LockOnBoxedPrimitive MathRoundIntLong MislabeledAndroidString MisusedDayOfYear MissingSuperCall MisusedWeekYear ModifyingCollectionWithItself NoCanIgnoreReturnValueOnClasses NonRuntimeAnnotation NullableOnContainingClass NullTernary OverridesJavaxInjectableMethod ParcelableCreator PeriodFrom PreconditionsInvalidPlaceholder ProtoBuilderReturnValueIgnored ProtoFieldNullComparison RandomModInteger RectIntersectReturnValueIgnored ReturnValueIgnored SelfAssignment SelfComparison SelfEquals SizeGreaterThanOrEqualsZero StringBuilderInitWithChar TreeToString TryFailThrowable UnnecessaryCheckNotNull UnusedCollectionModifiedInPlace XorPower See https://errorprone.info/bugpatterns for more information on the checks. Bug: 253827323 Test: m RUN_ERROR_PRONE=true javac-check Change-Id: I907959a17cd5fdf6504a654a08b4be93ef400d88 --- Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/Android.bp b/Android.bp index fa02f9d..ed0ade3 100644 --- a/Android.bp +++ b/Android.bp @@ -79,6 +79,7 @@ java_library_static { errorprone: { javacflags: [ "-Xep:CollectionIncompatibleType:WARN", // b/74213384 + "-Xep:BoxedPrimitiveEquality:WARN", ], } } -- cgit v1.2.3 From 3e89f4930a3b1575b896e0914321f892e3c3c535 Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Wed, 18 Jan 2023 15:04:00 +0000 Subject: Add alias for mockito-core naming scheme Bug: 265820493 Change-Id: Iec7178482f7101e0a933b349b6d73dcc3e53d082 Test: it builds --- Android.bp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Android.bp b/Android.bp index ed0ade3..716f9ae 100644 --- a/Android.bp +++ b/Android.bp @@ -84,6 +84,14 @@ java_library_static { } } +// Compatibility library for Maven artifact naming scheme +java_library_static { + name: "mockito-core", + hostdex: true, + static_libs: ["mockito"], + sdk_version: "core_current", +} + // Compatibility library for old name of host target java_library_host { name: "mockito-host", -- cgit v1.2.3