Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8bb5d05 authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by Gerrit Code Review
Browse files

Merge "Fix dex2oat symlink now that we generate dex2oat32/dex2oat64."

parents 74d25e39 d2a61c87

apex/vndk.go

+5 −3
Original line number Diff line number Diff line
@@ -154,10 +154,12 @@ func makeCompatSymlinks(name string, ctx android.ModuleContext) (symlinks []stri 


	// TODO(b/124106384): Clean up compat symlinks for ART binaries.

	if strings.HasPrefix(name, "com.android.art.") {

		artBinaries := []string{"dalvikvm", "dex2oat"}

		for _, b := range artBinaries {

			addSymlink("/apex/com.android.art/bin/"+b, "$(TARGET_OUT)/bin", b)

		addSymlink("/apex/com.android.art/bin/dalvikvm", "$(TARGET_OUT)/bin", "dalvikvm")

		dex2oat := "dex2oat32"

		if ctx.Config().Android64() {

			dex2oat = "dex2oat64"

		}

		addSymlink("/apex/com.android.art/bin/"+dex2oat, "$(TARGET_OUT)/bin", "dex2oat")

		return

	}

	return