diff options
| author | Jose "Pepe" Galmes <jgalmes@google.com> | 2021-09-01 20:26:26 +0000 |
|---|---|---|
| committer | Jose "Pepe" Galmes <jgalmes@google.com> | 2021-09-01 20:26:26 +0000 |
| commit | 58ff3c09c0a435e1aaa27966700db505c919f93a (patch) | |
| tree | 5aad1fb9973478337f50632062c2361928964853 | |
| parent | 29c59f7f4354771bc0aa6c87365d2770d8a6b43a (diff) | |
Revert "Skip dexbootjar check using AllowMissingDependencies flag"
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: I17dbc0e078746f8c8c7ae9b840bac1d1d3df3b21
| -rw-r--r-- | apex/apex_test.go | 6 | ||||
| -rw-r--r-- | java/dexpreopt_bootjars.go | 6 |
2 files changed, 1 insertions, 11 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index 360c9fe3f..e1b0cf2da 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -4644,12 +4644,6 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { // find the dex boot jar in it. We either need to disable the source libfoo // or make the prebuilt libfoo preferred. testDexpreoptWithApexes(t, bp, "module libfoo does not provide a dex boot jar", preparer, fragment) - // dexbootjar check is skipped if AllowMissingDependencies is true - preparerAllowMissingDeps := android.GroupFixturePreparers( - preparer, - android.PrepareForTestWithAllowMissingDependencies, - ) - testDexpreoptWithApexes(t, bp, "", preparerAllowMissingDeps, fragment) }) t.Run("prebuilt library preferred with source", func(t *testing.T) { diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go index f50705cc0..19c65cac7 100644 --- a/java/dexpreopt_bootjars.go +++ b/java/dexpreopt_bootjars.go @@ -489,11 +489,7 @@ func copyBootJarsToPredefinedLocations(ctx android.ModuleContext, srcBootDexJars dst := dstBootJarsByModule[name] if src == nil { - if !ctx.Config().AllowMissingDependencies() { - ctx.ModuleErrorf("module %s does not provide a dex boot jar", name) - } else { - ctx.AddMissingDependencies([]string{name}) - } + ctx.ModuleErrorf("module %s does not provide a dex boot jar", name) } else if dst == nil { ctx.ModuleErrorf("module %s is not part of the boot configuration", name) } else { |