diff options
| author | 2021-04-13 19:09:48 +0100 | |
|---|---|---|
| committer | 2021-04-13 19:09:48 +0100 | |
| commit | fa5e6b50aa739692da015981686e604ea94f579c (patch) | |
| tree | 23f0038bedb0bf6b99cadeae3df62546318cabfa /java | |
| parent | 6050c3c31e8d8444adc4d8f373fa2f75f321ba1c (diff) | |
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
Diffstat (limited to 'java')
| -rw-r--r-- | java/prebuilt_apis.go | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/java/prebuilt_apis.go b/java/prebuilt_apis.go index 8a442b5ff..c33e6c229 100644 --- a/java/prebuilt_apis.go +++ b/java/prebuilt_apis.go @@ -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) |