From 95e9c5bbfa8a1a46433183830a2429ac83979d33 Mon Sep 17 00:00:00 2001 From: satayev Date: Thu, 29 Apr 2021 11:50:26 +0100 Subject: Split SYSTEMSERVERCLASSPATH entries from platform_bootclasspath. Boot jars are different to system server jars at build level, due to added complexity of dexpreopt. As a logical separation add a new classpath fragment type and split existing classpaths.proto generation into relevant pieces. Bug: 180105615 Test: m && launch_cvd; atest CtsClasspathsTestCases Change-Id: I88bec09fc920166ffd0092faef980754ddeb6593 --- java/platform_bootclasspath.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/platform_bootclasspath.go') diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index 1acb9f4f5..1f2494296 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -72,8 +72,8 @@ type platformBootclasspathProperties struct { func platformBootclasspathFactory() android.SingletonModule { m := &platformBootclasspathModule{} m.AddProperties(&m.properties) - // TODO(satayev): split systemserver and apex jars into separate configs. - initClasspathFragment(m) + // TODO(satayev): split apex jars into separate configs. + initClasspathFragment(m, BOOTCLASSPATH) android.InitAndroidArchModule(m, android.DeviceSupported, android.MultilibCommon) return m } -- cgit v1.2.3-59-g8ed1b