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

Commit 96497485 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Gerrit Code Review
Browse files

Merge "Rename ART release APEX to com.android.art."

parents 8f01ff81 7f51107e

apex/vndk.go

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ 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.") {

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

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

		dex2oat := "dex2oat32"

		if ctx.Config().Android64() {

cc/androidmk.go

+5 −4
Original line number Diff line number Diff line
@@ -71,10 +71,11 @@ func (c *Module) AndroidMkEntries() []android.AndroidMkEntries { 


	entries := android.AndroidMkEntries{

		OutputFile: c.outputFile,

		// TODO(jiyong): add the APEXes providing shared libs to the required modules

		// Currently, adding c.Properties.ApexesProvidingSharedLibs is causing multiple

		// ART APEXes (com.android.art.debug|release) to be installed. And this

		// is breaking some older devices (like marlin) where system.img is small.

		// TODO(jiyong): add the APEXes providing shared libs to the required

		// modules Currently, adding c.Properties.ApexesProvidingSharedLibs is

		// causing multiple ART APEXes (com.android.art and com.android.art.debug)

		// to be installed. And this is breaking some older devices (like marlin)

		// where system.img is small.

		Required: c.Properties.AndroidMkRuntimeLibs,

		Include:  "$(BUILD_SYSTEM)/soong_cc_prebuilt.mk",

java/dexpreopt_bootjars.go

+2 −2
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ func getBootImageJar(ctx android.SingletonContext, image *bootImageConfig, modul 
	apexInfo := ctx.ModuleProvider(module, android.ApexInfoProvider).(android.ApexInfo)

	fromUpdatableApex := isApexModule && apexInfo.Updatable

	if image.name == artBootImageName {

		if isApexModule && len(apexInfo.InApexes) > 0 && allHavePrefix(apexInfo.InApexes, "com.android.art.") {

		if isApexModule && len(apexInfo.InApexes) > 0 && allHavePrefix(apexInfo.InApexes, "com.android.art") {

			// ok: found the jar in the ART apex

		} else if isApexModule && apexInfo.IsForPlatform() && isHostdex(module) {

			// exception (skip and continue): special "hostdex" platform variant
@@ -301,7 +301,7 @@ func getBootImageJar(ctx android.SingletonContext, image *bootImageConfig, modul 


func allHavePrefix(list []string, prefix string) bool {

	for _, s := range list {

		if !strings.HasPrefix(s, prefix) {

		if s != prefix && !strings.HasPrefix(s, prefix+".") {

			return false

		}

	}

scripts/build-mainline-modules.sh

+2 −2
Original line number Diff line number Diff line
@@ -3,13 +3,13 @@ 
# Non exhaustive list of modules where we want prebuilts. More can be added as

# needed.

MAINLINE_MODULES=(

  com.android.art

  com.android.art.debug

  com.android.art.release

  com.android.art.testing

  com.android.conscrypt

  com.android.i18n

  com.android.runtime

  com.android.tzdata

  com.android.i18n

)



# List of SDKs and module exports we know of.