From 9804da0544168f878b5adde8bf6e3a2e0b1c8d02 Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Tue, 26 Oct 2021 10:42:42 +0100
Subject: [PATCH] Dedup use of "prebuilt_"

Bug: 177893770
Test: m nothing
Change-Id: I664ee4d9c3aafda3de0a3f8985ee23f25db38680
---
 cc/prebuilt.go | 3 +--
 java/java.go   | 3 ---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/cc/prebuilt.go b/cc/prebuilt.go
index 62f393824..4a2c451f5 100644
--- a/cc/prebuilt.go
+++ b/cc/prebuilt.go
@@ -16,7 +16,6 @@ package cc
 
 import (
 	"path/filepath"
-	"strings"
 
 	"android/soong/android"
 )
@@ -232,7 +231,7 @@ func (p *prebuiltLibraryLinker) disablePrebuilt() {
 
 // Implements versionedInterface
 func (p *prebuiltLibraryLinker) implementationModuleName(name string) string {
-	return strings.TrimPrefix(name, "prebuilt_")
+	return android.RemoveOptionalPrebuiltPrefix(name)
 }
 
 func NewPrebuiltLibrary(hod android.HostOrDeviceSupported) (*Module, *libraryDecorator) {
diff --git a/java/java.go b/java/java.go
index 29f31e5b6..854097b0a 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1540,9 +1540,6 @@ var _ android.IDEInfo = (*Import)(nil)
 var _ android.IDECustomizedModuleName = (*Import)(nil)
 
 // Collect information for opening IDE project files in java/jdeps.go.
-const (
-	removedPrefix = "prebuilt_"
-)
 
 func (j *Import) IDEInfo(dpInfo *android.IdeInfo) {
 	dpInfo.Jars = append(dpInfo.Jars, j.PrebuiltSrcs()...)