Revert "cc/cc.go: Support per-image-variation "required""

Revert "init: Separate the required modules of core and recovery..."

Revert "[automerger] cc/cc.go: Support per-image-variation "requ..."

Revert submission 579058-b/196306898

Reason for revert: Devices not booting in Keystone lab
Reverted Changes:
I53f309b36:[automerger] init: Separate the required modules o...
I68be9ad4c:[automerger] Skip dexbootjar check using AllowMiss...
I068fefdef:[automerger] cc/cc.go: Support per-image-variation...
I40ae1fe6b:Remove unused VSDK projects
I78b062afd:Skip dexbootjar check using AllowMissingDependenci...
I03f0cf6af:init: Separate the required modules of core and re...
Iebab29ed5:cc/cc.go: Support per-image-variation "required"

Change-Id: Ib58fce041f90be0212d939ba55371db5ae2654a6

1 files changed, 0 insertions, 30 deletions

diff --git a/cc/cc.go b/cc/cc.go
index 73069c766..e346bd941 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -372,24 +372,6 @@ type BaseProperties struct {
 	// can depend on libraries that are not exported by the APEXes and use private symbols
 	// from the exported libraries.
 	Test_for []string `android:"arch_variant"`
-
-	Target struct {
-		Platform struct {
-			// List of modules required by the core variant.
-			Required []string `android:"arch_variant"`
-
-			// List of modules not required by the core variant.
-			Exclude_required []string `android:"arch_variant"`
-		} `android:"arch_variant"`
-
-		Recovery struct {
-			// List of modules required by the recovery variant.
-			Required []string `android:"arch_variant"`
-
-			// List of modules not required by the recovery variant.
-			Exclude_required []string `android:"arch_variant"`
-		} `android:"arch_variant"`
-	} `android:"arch_variant"`
 }
 
 type VendorProperties struct {
@@ -865,18 +847,6 @@ func (c *Module) HiddenFromMake() bool {
 	return c.Properties.HideFromMake
 }
 
-func (c *Module) RequiredModuleNames() []string {
-	required := android.CopyOf(c.ModuleBase.RequiredModuleNames())
-	if c.ImageVariation().Variation == android.CoreVariation {
-		required = append(required, c.Properties.Target.Platform.Required...)
-		required = removeListFromList(required, c.Properties.Target.Platform.Exclude_required)
-	} else if c.InRecovery() {
-		required = append(required, c.Properties.Target.Recovery.Required...)
-		required = removeListFromList(required, c.Properties.Target.Recovery.Exclude_required)
-	}
-	return android.FirstUniqueStrings(required)
-}
-
 func (c *Module) Toc() android.OptionalPath {
 	if c.linker != nil {
 		if library, ok := c.linker.(libraryInterface); ok {