Merge changes from topic "revert-15071196-init_first_stage_soong-GBJXQRPEKC" into sc-dev

* changes:
  Revert "Add install_in_root to cc_binary"
  Revert "Add ramdisk_available to sysprop_library"
  Revert "Fix ndk and aml arch order"

2 files changed, 0 insertions, 18 deletions

diff --git a/cc/cc.go b/cc/cc.go
index 5ee031462..c62fd6c8f 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -580,7 +580,6 @@ type installer interface {
 	hostToolPath() android.OptionalPath
 	relativeInstallPath() string
 	makeUninstallable(mod *Module)
-	installInRoot() bool
 }
 
 // bazelHandler is the interface for a helper object related to deferring to Bazel for
@@ -1307,10 +1306,6 @@ func (c *Module) isCfiAssemblySupportEnabled() bool {
 		Bool(c.sanitize.Properties.Sanitize.Config.Cfi_assembly_support)
 }
 
-func (c *Module) InstallInRoot() bool {
-	return c.installer != nil && c.installer.installInRoot()
-}
-
 type baseModuleContext struct {
 	android.BaseModuleContext
 	moduleContextImpl
diff --git a/cc/installer.go b/cc/installer.go
index f95b49346..e551c63e2 100644
--- a/cc/installer.go
+++ b/cc/installer.go
@@ -25,10 +25,6 @@ import (
 type InstallerProperties struct {
 	// install to a subdirectory of the default install path for the module
 	Relative_install_path *string `android:"arch_variant"`
-
-	// Install output directly in {partition}/, not in any subdir.  This is only intended for use by
-	// init_first_stage.
-	Install_in_root *bool `android:"arch_variant"`
 }
 
 type installLocation int
@@ -70,11 +66,6 @@ func (installer *baseInstaller) installDir(ctx ModuleContext) android.InstallPat
 	if ctx.toolchain().Is64Bit() && installer.dir64 != "" {
 		dir = installer.dir64
 	}
-
-	if installer.installInRoot() {
-		dir = ""
-	}
-
 	if ctx.Target().NativeBridge == android.NativeBridgeEnabled {
 		dir = filepath.Join(dir, ctx.Target().NativeBridgeRelativePath)
 	} else if !ctx.Host() && ctx.Config().HasMultilibConflict(ctx.Arch().ArchType) {
@@ -119,7 +110,3 @@ func (installer *baseInstaller) relativeInstallPath() string {
 func (installer *baseInstaller) makeUninstallable(mod *Module) {
 	mod.ModuleBase.MakeUninstallable()
 }
-
-func (installer *baseInstaller) installInRoot() bool {
-	return Bool(installer.Properties.Install_in_root)
-}