From 0291abca62ae2a1c11861e1a1deab7571c1274e1 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Tue, 23 Nov 2021 19:27:52 +0000 Subject: [PATCH] Remove the compat symlinks to ART binaries. App compact impact is hard to judge (see http://b/124106384#comment9 ff), so this tries it early in the dessert cycle. This is also a workaround for b/209867137 where the symlink install rules interact badly with the artifact_path_requirements.mk check. Test: m installclean && m droid verify that $(PRODUCT_DIR)/system/bin doesn't have dalvikvm and dex2oat symlinks Bug: 124106384 Bug: 209867137 Change-Id: I044fb40f656beeb7c6e61f1d418fa13f56714a70 --- apex/vndk.go | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/apex/vndk.go b/apex/vndk.go index cf525a874..ef3e5e1c5 100644 --- a/apex/vndk.go +++ b/apex/vndk.go @@ -140,21 +140,5 @@ func makeCompatSymlinks(name string, ctx android.ModuleContext, primaryApex bool addSymlink("/apex/com.android.i18n/etc/icu", dir, "icu") } - // TODO(b/124106384): Clean up compat symlinks for ART binaries. - if name == "com.android.art" { - dir := android.PathForModuleInPartitionInstall(ctx, "system", "bin") - addSymlink("/apex/com.android.art/bin/dalvikvm", dir, "dalvikvm") - dex2oat := "dex2oat32" - if ctx.Config().Android64() { - dex2oat = "dex2oat64" - } - addSymlink("/apex/com.android.art/bin/"+dex2oat, dir, "dex2oat") - } else if name == "com.android.art" || strings.HasPrefix(name, "com.android.art.") { - dir := android.PathForModuleInPartitionInstall(ctx, "system", "bin") - symlinks = append(symlinks, - dir.Join(ctx, "dalvikvm"), - dir.Join(ctx, "dex2oat")) - } - return symlinks }