diff options
| author | Corina Grigoras <corinac@google.com> | 2021-06-08 10:54:32 +0000 |
|---|---|---|
| committer | Corina Grigoras <corinac@google.com> | 2021-06-08 10:54:32 +0000 |
| commit | a2adb457a3282056f303bd01d604d63bd69a97b8 (patch) | |
| tree | 84002067e17ae074a8e9ad6154ab2357d493d6f9 /build | |
| parent | 03306f85fb2fe0daf6fc0797319a9f72252cf44f (diff) | |
| download | cuttlefish-a2adb457a3282056f303bd01d604d63bd69a97b8.tar.gz | |
Revert "Reland "Support auto-generation of ESP, add otheros_root""
This reverts commit 03306f85fb2fe0daf6fc0797319a9f72252cf44f.
Reason for revert: b/190181415
Change-Id: I7ad9c49d7a801d655e386926f9a2f0bc16daf87d
Diffstat (limited to 'build')
| -rw-r--r-- | build/Android.bp | 4 | ||||
| -rw-r--r-- | build/cvd-host-package.go | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/build/Android.bp b/build/Android.bp index c70051c61..d51631334 100644 --- a/build/Android.bp +++ b/build/Android.bp @@ -23,7 +23,6 @@ soong_config_module_type { module_type: "cvd_host_package", config_namespace: "cvd", value_variables: [ - "grub_config", "launch_configs", "custom_action_config", "custom_action_servers", @@ -65,9 +64,6 @@ cvd_host_tools = [ "mkenvimage", "modem_simulator", "ms-tpm-20-ref", - "mcopy", - "mmd", - "mtools", "newfs_msdos", "powerwash_cvd", "restart_cvd", diff --git a/build/cvd-host-package.go b/build/cvd-host-package.go index d15708396..b025386cd 100644 --- a/build/cvd-host-package.go +++ b/build/cvd-host-package.go @@ -56,12 +56,6 @@ func (c *cvdHostPackage) DepsMutator(ctx android.BottomUpMutatorContext) { {Mutator: "arch", Variation: android.Common.String()}, } for _, dep := range strings.Split( - ctx.Config().VendorConfig("cvd").String("grub_config"), " ") { - if ctx.OtherModuleExists(dep) { - ctx.AddVariationDependencies(variations, cvdHostPackageDependencyTag, dep) - } - } - for _, dep := range strings.Split( ctx.Config().VendorConfig("cvd").String("launch_configs"), " ") { if ctx.OtherModuleExists(dep) { ctx.AddVariationDependencies(variations, cvdHostPackageDependencyTag, dep) |