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

Commit fa5e6b50 authored by Anton Hansson's avatar Anton Hansson
Browse files

Remove special case code for obsolete files 

incompatibilities.txt doesn't exist anymore, only
"<module>-incompatibilities.txt". Clean up the associated logic that
mapped incompatibilities.txt to android-incompatibilities.txt.

Bug: 178171189
Test: m
Change-Id: I61eeb5dcc82770fa2af356bad11b7205551d6d83
parent 6050c3c3

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)