From 9ea3a5c8c7327a8d470311d668c4069851f32a68 Mon Sep 17 00:00:00 2001
From: Priyanka <priyankaspatel@google.com>
Date: Tue, 21 May 2024 09:52:11 +0100
Subject: [PATCH] Update location of output.
Fixes: 341863041
Test: run commands in the Winscope README and check mapping updated
Change-Id: I154874a376c62ad2bb6e38ef9ca4c0865493cf34
---
.../intdef_mappings/src/android/processor/IntDefProcessor.kt | 4 ++--
.../test/android/processor/IntDefProcessorTest.kt | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/processors/intdef_mappings/src/android/processor/IntDefProcessor.kt b/tools/processors/intdef_mappings/src/android/processor/IntDefProcessor.kt
index 4c1fa6ec40b3..4995eebdd79e 100644
--- a/tools/processors/intdef_mappings/src/android/processor/IntDefProcessor.kt
+++ b/tools/processors/intdef_mappings/src/android/processor/IntDefProcessor.kt
@@ -30,7 +30,7 @@ import javax.lang.model.SourceVersion
import javax.lang.model.element.AnnotationValue
import javax.lang.model.element.TypeElement
import javax.tools.Diagnostic.Kind
-import javax.tools.StandardLocation.CLASS_OUTPUT
+import javax.tools.StandardLocation.SOURCE_OUTPUT
import kotlin.collections.set
/**
@@ -126,7 +126,7 @@ class IntDefProcessor : AbstractProcessor() {
@Throws(IOException::class)
private fun outputToFile(annotationTypeToIntDefMapping: Map<String, IntDefMapping>) {
val resource = processingEnv.filer.createResource(
- CLASS_OUTPUT, "com.android.winscope", outputName)
+ SOURCE_OUTPUT, "com.android.winscope", outputName)
val writer = resource.openWriter()
serializeTo(annotationTypeToIntDefMapping, writer)
writer.close()
diff --git a/tools/processors/intdef_mappings/test/android/processor/IntDefProcessorTest.kt b/tools/processors/intdef_mappings/test/android/processor/IntDefProcessorTest.kt
index c0c159c98aac..d87b6df901b2 100644
--- a/tools/processors/intdef_mappings/test/android/processor/IntDefProcessorTest.kt
+++ b/tools/processors/intdef_mappings/test/android/processor/IntDefProcessorTest.kt
@@ -24,7 +24,7 @@ import junit.framework.Assert.assertEquals
import org.junit.Test
import java.io.StringWriter
import javax.tools.JavaFileObject
-import javax.tools.StandardLocation.CLASS_OUTPUT
+import javax.tools.StandardLocation.SOURCE_OUTPUT
/**
* Tests for [IntDefProcessor]
@@ -112,7 +112,7 @@ class IntDefProcessorTest {
.compile(filesToCompile.toMutableList())
assertThat(compilation).succeeded()
- assertThat(compilation).generatedFile(CLASS_OUTPUT, "com.android.winscope",
+ assertThat(compilation).generatedFile(SOURCE_OUTPUT, "com.android.winscope",
"intDefMapping.json").contentsAsUtf8String().isEqualTo(expectedFile)
}
--
GitLab