diff options
| author | 2020-11-24 01:56:46 +0000 | |
|---|---|---|
| committer | 2020-11-24 01:56:46 +0000 | |
| commit | a74ecc37094839b8ab663a0979d7858686f9ebf7 (patch) | |
| tree | 165a943ff1d37d9797a1f6bc9c4cd74f923ab20c | |
| parent | c0bc040eceb41b1a97d7f0c74e6919da8fb9de7b (diff) | |
| parent | 8b886c6f9c8f38735dee286ecd9c85cfb886b470 (diff) | |
Merge "Fix genHiddenConstructor missing @hide"
| -rw-r--r-- | tools/codegen/src/com/android/codegen/Generators.kt | 9 | ||||
| -rw-r--r-- | tools/codegen/src/com/android/codegen/SharedConstants.kt | 2 | 
2 files changed, 7 insertions, 4 deletions
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"  |