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

Commit e9d2f9fc authored by Anton Hansson's avatar Anton Hansson Committed by Gerrit Code Review
Browse files

Merge "Remove special case code for obsolete files"

parents 35584eeb fa5e6b50

java/prebuilt_apis.go

+2 −8
Original line number Diff line number Diff line
@@ -253,14 +253,8 @@ func prebuiltApiFiles(mctx android.LoadHookContext, p *prebuiltApis) { 
		files := getPrebuiltFilesInSubdir(mctx, nextApiDir, "api/*incompatibilities.txt")

		for _, f := range files {

			localPath := strings.TrimPrefix(f, mydir)

			module, _, scope := parseApiFilePath(mctx, localPath)



			// Figure out which module is referenced by this file. Special case for "android".

			referencedModule := strings.TrimSuffix(module, "incompatibilities")

			referencedModule = strings.TrimSuffix(referencedModule, "-")

			if referencedModule == "" {

				referencedModule = "android"

			}

			filename, _, scope := parseApiFilePath(mctx, localPath)

			referencedModule := strings.TrimSuffix(filename, "-incompatibilities")



			createApiModule(mctx, apiModuleName(referencedModule+"-incompatibilities", scope, "latest"), localPath)