From 6fe07a5017d8434d4c887b441468f9023d4170e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E6=B3=8A?= Date: Wed, 14 Jun 2023 07:38:44 +0000 Subject: [PATCH] Revert "Use installExecutable for cc binaries" This reverts commit c1fd399ccd8597f6d150a3385d468aeead42d44d. Reason for revert: build break for prebuilt host binary in read-only source tree Change-Id: I9f1792f324acbfbaf53254a972cb0894140efabe Test: m BUILD_BROKEN_SRC_DIR_IS_WRITABLE=false mkimage-host Bug: 287168966 --- cc/binary.go | 2 +- cc/installer.go | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/cc/binary.go b/cc/binary.go index 097f82252..496c610c2 100644 --- a/cc/binary.go +++ b/cc/binary.go @@ -512,7 +512,7 @@ func (binary *binaryDecorator) install(ctx ModuleContext, file android.Path) { } binary.baseInstaller.subDir = "bootstrap" } - binary.baseInstaller.installExecutable(ctx, file) + binary.baseInstaller.install(ctx, file) var preferredArchSymlinkPath android.OptionalPath for _, symlink := range binary.symlinks { diff --git a/cc/installer.go b/cc/installer.go index 716a0dfc6..e2c0e7b8d 100644 --- a/cc/installer.go +++ b/cc/installer.go @@ -100,10 +100,6 @@ func (installer *baseInstaller) install(ctx ModuleContext, file android.Path) { installer.path = ctx.InstallFile(installer.installDir(ctx), file.Base(), file) } -func (installer *baseInstaller) installExecutable(ctx ModuleContext, file android.Path) { - installer.path = ctx.InstallExecutable(installer.installDir(ctx), file.Base(), file) -} - func (installer *baseInstaller) everInstallable() bool { // Most cc modules are installable. return true