From 7d22657c458b7cf7f79cdd3c298bfec13be93533 Mon Sep 17 00:00:00 2001 From: satayev Date: Tue, 18 May 2021 19:37:32 +0100 Subject: [PATCH] Use absolute paths in classpaths.proto. The intention before was to use relative paths to a partition where a config is defined. However, jars in /system_ext partition are planned to be declared in /system's classpaths.proto config. Bug: 180105615 Test: derive_classpath_test, CtsClasspathsTestCases Change-Id: Icc3e1a903c34187cfcd67a3ae7bc3dd746445c03 --- java/classpath_fragment.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/classpath_fragment.go b/java/classpath_fragment.go index 740809093..bc0416a47 100644 --- a/java/classpath_fragment.go +++ b/java/classpath_fragment.go @@ -136,7 +136,7 @@ func writeClasspathsJson(ctx android.ModuleContext, output android.WritablePath, for idx, jar := range jars { fmt.Fprintf(&content, "{\n") - fmt.Fprintf(&content, "\"relativePath\": \"%s\",\n", jar.path) + fmt.Fprintf(&content, "\"path\": \"%s\",\n", jar.path) fmt.Fprintf(&content, "\"classpath\": \"%s\"\n", jar.classpath) if idx < len(jars)-1 {