From ddb26814559a0c1e01593f29b180b501ea48e5f6 Mon Sep 17 00:00:00 2001 From: Eugene Susla Date: Tue, 3 Nov 2020 18:24:06 -0800 Subject: Disregard annotation params for stale dataclass detection Annotation processor seens annotation args with constants already inlined, making it challenging to compare to the souce-generated metadata that contains initial expressions. For now just ignoring args for all non-DataClass annotations to prevent false positives Test: . frameworks/base/tests/Codegen/runTest.sh Exempt-From-Owner-Approval: changing metadata on multiple files Change-Id: I640816ae0f20f36b1b828bc2161f53788c4a4dae --- tools/codegen/src/com/android/codegen/InputSignaturesComputation.kt | 1 + tools/codegen/src/com/android/codegen/SharedConstants.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'tools/codegen/src') diff --git a/tools/codegen/src/com/android/codegen/InputSignaturesComputation.kt b/tools/codegen/src/com/android/codegen/InputSignaturesComputation.kt index 1aea57514855..83108e5ae109 100644 --- a/tools/codegen/src/com/android/codegen/InputSignaturesComputation.kt +++ b/tools/codegen/src/com/android/codegen/InputSignaturesComputation.kt @@ -63,6 +63,7 @@ private fun ClassPrinter.annotationToString(ann: AnnotationExpr?): String { append("@") append(getFullClassName(ann.nameAsString)) if (ann is MarkerAnnotationExpr) return@buildString + if (!ann.nameAsString.startsWith("DataClass")) return@buildString append("(") diff --git a/tools/codegen/src/com/android/codegen/SharedConstants.kt b/tools/codegen/src/com/android/codegen/SharedConstants.kt index 147f18c35e5c..2e176c3d3bec 100644 --- a/tools/codegen/src/com/android/codegen/SharedConstants.kt +++ b/tools/codegen/src/com/android/codegen/SharedConstants.kt @@ -1,7 +1,7 @@ package com.android.codegen const val CODEGEN_NAME = "codegen" -const val CODEGEN_VERSION = "1.0.19" +const val CODEGEN_VERSION = "1.0.20" const val CANONICAL_BUILDER_CLASS = "Builder" const val BASE_BUILDER_CLASS = "BaseBuilder" -- cgit v1.2.3-59-g8ed1b