From 3db3547d1fc19a18aa180d3b929270a6736fb501 Mon Sep 17 00:00:00 2001 From: satayev Date: Thu, 6 May 2021 23:59:58 +0100 Subject: Generate empty classpaths.proto for bootclasspath_fragment.go. - Adds all required details for bootclasspath_fragment to implement classpath_fragment. - Keeps the actual boot jars in platform-bootclasspath to begin with. - Makes sure to put the file in apex/etc/classpath on device. Note that for platform versions of classpath fragment AndroidMkEntries perform the installation, while for APEXes it must be plumbed via apex.go. Bug: 180105615 Test: m && launch_cvd; atest CtsClasspathsTestCases Change-Id: I6101ebdf5b8bcbe95c0b7ce21f3f67a2685aef50 --- java/classpath_fragment.go | 2 ++ 1 file changed, 2 insertions(+) (limited to 'java/classpath_fragment.go') diff --git a/java/classpath_fragment.go b/java/classpath_fragment.go index 2e0582390..7422fa2d5 100644 --- a/java/classpath_fragment.go +++ b/java/classpath_fragment.go @@ -143,6 +143,8 @@ func writeClasspathsJson(ctx android.ModuleContext, output android.WritablePath, android.WriteFileRule(ctx, output, content.String()) } +// Returns AndroidMkEntries objects to install generated classpath.proto. +// Do not use this to install into APEXes as the injection of the generated files happen separately for APEXes. func (c *ClasspathFragmentBase) androidMkEntries() []android.AndroidMkEntries { return []android.AndroidMkEntries{{ Class: "ETC", -- cgit v1.2.3-59-g8ed1b