From 71d5e7775e7df89bdbccc1de5ebb6f4742dc760f Mon Sep 17 00:00:00 2001 From: Eugene Susla Date: Wed, 11 Sep 2019 13:46:09 -0700 Subject: Fix codegen not accepting relative paths Fixes: 140886378 Test: codegen tests/Codegen/src/com/android/codegentest/SampleDataClass.java; ./frameworks/base/tests/Codegen/runTest.sh Change-Id: Ie2b5c55f35ec7865bf34cf9e99ef7751eb5f8d98 --- tools/codegen/src/com/android/codegen/Main.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/Main.kt b/tools/codegen/src/com/android/codegen/Main.kt index 0f932f3c34e1..fa2b41adcacb 100755 --- a/tools/codegen/src/com/android/codegen/Main.kt +++ b/tools/codegen/src/com/android/codegen/Main.kt @@ -107,7 +107,7 @@ fun main(args: Array) { println(CODEGEN_VERSION) System.exit(0) } - val file = File(args.last()) + val file = File(args.last()).absoluteFile val sourceLinesNoClosingBrace = file.readLines().dropLastWhile { it.startsWith("}") || it.all(Char::isWhitespace) } diff --git a/tools/codegen/src/com/android/codegen/SharedConstants.kt b/tools/codegen/src/com/android/codegen/SharedConstants.kt index 7d50ad10de00..b2cc81391510 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.0" +const val CODEGEN_VERSION = "1.0.1" const val CANONICAL_BUILDER_CLASS = "Builder" const val BASE_BUILDER_CLASS = "BaseBuilder" -- cgit v1.2.3