From ed4d8e5f36c56dc2e4bec07ef5520e1d7aa2ee8b Mon Sep 17 00:00:00 2001 From: Eugene Susla Date: Mon, 30 Nov 2020 16:57:35 -0800 Subject: Fix genHiddenBuilder generating an invalid buildUpon() method This removes a redundant check causing the method to be generated Test: . frameworks/base/tests/Codegen/runTest.sh Change-Id: Ibe7ee110f7b21875d2f7f6784deca66638bab6c4 --- tools/codegen/src/com/android/codegen/ClassPrinter.kt | 1 - tools/codegen/src/com/android/codegen/SharedConstants.kt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'tools/codegen/src') diff --git a/tools/codegen/src/com/android/codegen/ClassPrinter.kt b/tools/codegen/src/com/android/codegen/ClassPrinter.kt index b90e1bb3e7e7..8cae14a2d040 100644 --- a/tools/codegen/src/com/android/codegen/ClassPrinter.kt +++ b/tools/codegen/src/com/android/codegen/ClassPrinter.kt @@ -145,7 +145,6 @@ class ClassPrinter( } return when { cliArgs.contains("--hidden-$kebabCase") -> true - this == FeatureFlag.BUILD_UPON -> FeatureFlag.BUILDER.hidden else -> false } } diff --git a/tools/codegen/src/com/android/codegen/SharedConstants.kt b/tools/codegen/src/com/android/codegen/SharedConstants.kt index 6a635d0e6181..d9ad649782bb 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.21" +const val CODEGEN_VERSION = "1.0.22" const val CANONICAL_BUILDER_CLASS = "Builder" const val BASE_BUILDER_CLASS = "BaseBuilder" -- cgit v1.2.3-59-g8ed1b