From 8b886c6f9c8f38735dee286ecd9c85cfb886b470 Mon Sep 17 00:00:00 2001 From: Eugene Susla Date: Mon, 23 Nov 2020 16:02:53 -0800 Subject: Fix genHiddenConstructor missing @hide Test: run on AppOpsManager, ensure ctr hidden Change-Id: I691628d04664b5d9e871fdeadb32455bfda8b158 --- tools/codegen/src/com/android/codegen/Generators.kt | 9 ++++++--- tools/codegen/src/com/android/codegen/SharedConstants.kt | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'tools/codegen/src') diff --git a/tools/codegen/src/com/android/codegen/Generators.kt b/tools/codegen/src/com/android/codegen/Generators.kt index 6c6d011cfede..5fc800b09ee9 100644 --- a/tools/codegen/src/com/android/codegen/Generators.kt +++ b/tools/codegen/src/com/android/codegen/Generators.kt @@ -5,8 +5,6 @@ import com.github.javaparser.ast.body.MethodDeclaration import com.github.javaparser.ast.body.VariableDeclarator import com.github.javaparser.ast.expr.AnnotationExpr import com.github.javaparser.ast.expr.ArrayInitializerExpr -import com.github.javaparser.ast.expr.LiteralExpr -import com.github.javaparser.ast.expr.UnaryExpr import java.io.File @@ -163,7 +161,12 @@ fun ClassPrinter.generateCopyConstructor() { return } - +"/** Copy constructor */" + +"/**" + +" * Copy constructor" + if (FeatureFlag.COPY_CONSTRUCTOR.hidden) { + +" * @hide" + } + +" */" +GENERATED_MEMBER_HEADER "public $ClassName(@$NonNull $ClassName orig)" { fields.forEachApply { diff --git a/tools/codegen/src/com/android/codegen/SharedConstants.kt b/tools/codegen/src/com/android/codegen/SharedConstants.kt index 2e176c3d3bec..6a635d0e6181 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.20" +const val CODEGEN_VERSION = "1.0.21" const val CANONICAL_BUILDER_CLASS = "Builder" const val BASE_BUILDER_CLASS = "BaseBuilder" -- cgit v1.2.3-59-g8ed1b