From 0a693c5b5c9e5605262e4fe89d3bef8c7ffe6b67 Mon Sep 17 00:00:00 2001 From: Chun-Yi Lee Date: Tue, 22 Aug 2023 01:18:45 +0000 Subject: [PATCH] Revert "Add apex compat symlinks to LOCAL_SOONG_INSTALL_SYMLINKS" Revert submission 2718295-colefaust_track_apex_compat_symlinks Reason for revert: To validate if this change is causing the build breakage. Reverted changes: /q/submissionid:2718295-colefaust_track_apex_compat_symlinks Change-Id: I1896530219cf984efdf9ca7f4b14d8784367f242 --- apex/androidmk.go | 1 - apex/prebuilt.go | 1 - 2 files changed, 2 deletions(-) diff --git a/apex/androidmk.go b/apex/androidmk.go index b0c391846..f4690620c 100644 --- a/apex/androidmk.go +++ b/apex/androidmk.go @@ -287,7 +287,6 @@ func (a *apexBundle) androidMkForType() android.AndroidMkData { if a.installable() { fmt.Fprintln(w, "LOCAL_SOONG_INSTALLED_MODULE :=", a.installedFile.String()) fmt.Fprintln(w, "LOCAL_SOONG_INSTALL_PAIRS :=", a.outputFile.String()+":"+a.installedFile.String()) - fmt.Fprintln(w, "LOCAL_SOONG_INSTALL_SYMLINKS := ", strings.Join(a.compatSymlinks.Strings(), " ")) } // Because apex writes .mk with Custom(), we need to write manually some common properties diff --git a/apex/prebuilt.go b/apex/prebuilt.go index f2e87c829..3509e6cbe 100644 --- a/apex/prebuilt.go +++ b/apex/prebuilt.go @@ -235,7 +235,6 @@ func (p *prebuiltCommon) AndroidMkEntries() []android.AndroidMkEntries { entries.SetString("LOCAL_MODULE_STEM", p.installFilename) entries.SetPath("LOCAL_SOONG_INSTALLED_MODULE", p.installedFile) entries.SetString("LOCAL_SOONG_INSTALL_PAIRS", p.outputApex.String()+":"+p.installedFile.String()) - entries.AddStrings("LOCAL_SOONG_INSTALL_SYMLINKS", p.compatSymlinks.Strings()...) entries.SetBoolIfTrue("LOCAL_UNINSTALLABLE_MODULE", !p.installable()) entries.AddStrings("LOCAL_OVERRIDES_MODULES", p.prebuiltCommonProperties.Overrides...) p.addRequiredModules(entries)