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

Commit dc3afbe3 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Fix mistake in disting of api txt" am: 89ee3e63 am: fc4d75a1 am: 26554faa 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2059568



Change-Id: I15e56be28fe46471aa63aa123c757bce6512d3f7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d405fc44 26554faa

api/api.go

+30 −23
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import ( 
const art = "art.module.public.api"

const conscrypt = "conscrypt.module.public.api"

const i18n = "i18n.module.public.api"



var core_libraries_modules = []string{art, conscrypt, i18n}



// The intention behind this soong plugin is to generate a number of "merged"
@@ -92,6 +93,8 @@ type fgProps struct { 
type MergedTxtDefinition struct {

	// "current.txt" or "removed.txt"

	TxtFilename string

	// Filename in the new dist dir. "android.txt" or "android-removed.txt"

	DistFilename string

	// The module for the non-updatable / non-module part of the api.

	BaseTxt string

	// The list of modules that are relevant for this merged txt.
@@ -112,7 +115,6 @@ func createMergedTxt(ctx android.LoadHookContext, txt MergedTxtDefinition) { 
	if txt.Scope != "public" {

		filename = txt.Scope + "-" + filename

	}



	props := genruleProps{}

	props.Name = proptools.StringPtr(ctx.ModuleName() + "-" + filename)

	props.Tools = []string{"metalava"}
@@ -126,9 +128,9 @@ func createMergedTxt(ctx android.LoadHookContext, txt MergedTxtDefinition) { 
			Dest:    proptools.StringPtr(filename),

		},

		{

			Targets: []string{"sdk"},

			Targets: []string{"api_txt", "sdk"},

			Dir:     proptools.StringPtr("apistubs/android/" + txt.Scope + "/api"),

			Dest:    proptools.StringPtr(txt.TxtFilename),

			Dest:    proptools.StringPtr(txt.DistFilename),

		},

	}

	props.Visibility = []string{"//visibility:public"}
@@ -240,9 +242,11 @@ func createMergedTxts(ctx android.LoadHookContext, bootclasspath, system_server_ 
	var textFiles []MergedTxtDefinition



	tagSuffix := []string{".api.txt}", ".removed-api.txt}"}

	distFilename := []string{"android.txt", "android-removed.txt"}

	for i, f := range []string{"current.txt", "removed.txt"} {

		textFiles = append(textFiles, MergedTxtDefinition{

			TxtFilename:  f,

			DistFilename: distFilename[i],

			BaseTxt:      ":non-updatable-" + f,

			Modules:      bootclasspath,

			ModuleTag:    "{.public" + tagSuffix[i],
@@ -250,6 +254,7 @@ func createMergedTxts(ctx android.LoadHookContext, bootclasspath, system_server_ 
		})

		textFiles = append(textFiles, MergedTxtDefinition{

			TxtFilename:  f,

			DistFilename: distFilename[i],

			BaseTxt:      ":non-updatable-system-" + f,

			Modules:      bootclasspath,

			ModuleTag:    "{.system" + tagSuffix[i],
@@ -257,6 +262,7 @@ func createMergedTxts(ctx android.LoadHookContext, bootclasspath, system_server_ 
		})

		textFiles = append(textFiles, MergedTxtDefinition{

			TxtFilename:  f,

			DistFilename: distFilename[i],

			BaseTxt:      ":non-updatable-module-lib-" + f,

			Modules:      bootclasspath,

			ModuleTag:    "{.module-lib" + tagSuffix[i],
@@ -264,6 +270,7 @@ func createMergedTxts(ctx android.LoadHookContext, bootclasspath, system_server_ 
		})

		textFiles = append(textFiles, MergedTxtDefinition{

			TxtFilename:  f,

			DistFilename: distFilename[i],

			BaseTxt:      ":non-updatable-system-server-" + f,

			Modules:      system_server_classpath,

			ModuleTag:    "{.system-server" + tagSuffix[i],