From e5c7d7c59e63919e9b6ccd655c35fc5371a8bce9 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 18 Dec 2024 17:08:07 -0800
Subject: Use unique apex variations for bootclasspath fragments

Upcoming changes to the ApexInfo mutator will require unique apex
variations for the bootclasspath fragments, change them now to simplify
comparisons.

Test: go test ./...
Change-Id: Ia8880fe5ac22a7bd2fb9ddaeb3b04b9ae90b1701
---
 java/systemserver_classpath_fragment.go | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'java/systemserver_classpath_fragment.go')

diff --git a/java/systemserver_classpath_fragment.go b/java/systemserver_classpath_fragment.go
index 3176ad94c..f3074ed0a 100644
--- a/java/systemserver_classpath_fragment.go
+++ b/java/systemserver_classpath_fragment.go
@@ -58,6 +58,10 @@ func platformSystemServerClasspathFactory() android.Module {
 	return m
 }
 
+func (m *platformSystemServerClasspathModule) UniqueApexVariations() bool {
+	return true
+}
+
 func (p *platformSystemServerClasspathModule) AndroidMkEntries() (entries []android.AndroidMkEntries) {
 	return p.classpathFragmentBase().androidMkEntries()
 }
@@ -115,6 +119,9 @@ func systemServerClasspathFactory() android.Module {
 	android.InitAndroidArchModule(m, android.DeviceSupported, android.MultilibCommon)
 	return m
 }
+func (m *SystemServerClasspathModule) UniqueApexVariations() bool {
+	return true
+}
 
 func (s *SystemServerClasspathModule) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 	if len(s.properties.Contents.GetOrDefault(ctx, nil)) == 0 && len(s.properties.Standalone_contents.GetOrDefault(ctx, nil)) == 0 {
-- 
cgit v1.2.3-59-g8ed1b