From 7daee0bba47aa72a5d151b8218fbeaa03acbb50b Mon Sep 17 00:00:00 2001 From: Eugene Susla Date: Fri, 1 Nov 2019 17:51:27 -0700 Subject: [codegen] Fix generation for files without end markers This fixes a bug where cedegen fails for files that were generated before end of generated code section markers were introduced. Test: . master/frameworks/base/tests/Codegen/runTest.sh Change-Id: Ia68e8124fcbdeeb2052067ba8731e68e42007529 --- tools/codegen/src/com/android/codegen/FileInfo.kt | 2 +- tools/codegen/src/com/android/codegen/SharedConstants.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/codegen/src') diff --git a/tools/codegen/src/com/android/codegen/FileInfo.kt b/tools/codegen/src/com/android/codegen/FileInfo.kt index 9c15fbf84223..909472640f29 100644 --- a/tools/codegen/src/com/android/codegen/FileInfo.kt +++ b/tools/codegen/src/com/android/codegen/FileInfo.kt @@ -164,7 +164,7 @@ class FileInfo( } if (endInclusive == -1) { // Legacy generated code doesn't have end markers - endInclusive = fileInfo.sourceLines.size - 2 + endInclusive = sourceNoPrefix.size - 2 } IntRange( range.start + start - fileInfo.generatedWarningNumPrecedingEmptyLines, diff --git a/tools/codegen/src/com/android/codegen/SharedConstants.kt b/tools/codegen/src/com/android/codegen/SharedConstants.kt index 270d34a01a64..339057f24833 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.11" +const val CODEGEN_VERSION = "1.0.12" const val CANONICAL_BUILDER_CLASS = "Builder" const val BASE_BUILDER_CLASS = "BaseBuilder" -- cgit v1.2.3