commit | 295da16b951ecb302f804f3ca71aaf6a877d2c31 | [log] [tgz] |
---|---|---|
author | Iván Budnik <ivanbuper@google.com> | Fri Mar 10 16:11:26 2023 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Mar 10 16:11:26 2023 +0000 |
tree | 4c5874c0cb579fc818c5684c85b8ced2f0d45bb9 | |
parent | ad222f271a0584c4a15670eb935fcd33ff804350 [diff] [blame] |
Revert "Export non-apex variants of modules to make" Revert submission 2462194-androidmk_for_apex_dependencies Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=full-eng&lkgb=9723453&lkbb=9724944&fkbb=9723508, bug b/272663333. Reverted changes: /q/submissionid:2462194-androidmk_for_apex_dependencies Bug: 272663333 Change-Id: I847fa910a8d54de19954f56fe92a80a9bcd0ee18
diff --git a/android/apex.go b/android/apex.go index a0ac5b8..358818f 100644 --- a/android/apex.go +++ b/android/apex.go
@@ -603,7 +603,7 @@ // Do not install the module for platform, but still allow it to output // uninstallable AndroidMk entries in certain cases when they have side // effects. TODO(jiyong): move this routine to somewhere else - mod.SkipInstall() + mod.MakeUninstallable() } if !platformVariation { mctx.SetVariationProvider(mod, ApexInfoProvider, apexInfos[i-1])