diff options
| author | 2021-04-02 10:24:13 +0100 | |
|---|---|---|
| committer | 2021-04-06 21:20:58 +0100 | |
| commit | 864116ce3f76ef7bcde9a5779a1df0d9facaa4ea (patch) | |
| tree | 8aeab82bfa9d3c4c36c590887b0d345f74d34035 /java | |
| parent | e1d3837645846596d3db0e0e5bc559e8d2876e0b (diff) | |
Add PrebuiltNameFromSource
Bug: 177892522
Test: m nothing
Change-Id: I45274836d59adbd6b2a2a848705b189398f1e766
Diffstat (limited to 'java')
| -rw-r--r-- | java/sdk_library.go | 4 | ||||
| -rw-r--r-- | java/system_modules.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/java/sdk_library.go b/java/sdk_library.go index 37b8d9f62..eb9ba9bde 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -1945,11 +1945,11 @@ func (module *SdkLibraryImport) ComponentDepsMutator(ctx android.BottomUpMutator } // Add dependencies to the prebuilt stubs library - ctx.AddVariationDependencies(nil, apiScope.stubsTag, "prebuilt_"+module.stubsLibraryModuleName(apiScope)) + ctx.AddVariationDependencies(nil, apiScope.stubsTag, android.PrebuiltNameFromSource(module.stubsLibraryModuleName(apiScope))) if len(scopeProperties.Stub_srcs) > 0 { // Add dependencies to the prebuilt stubs source library - ctx.AddVariationDependencies(nil, apiScope.stubsSourceTag, "prebuilt_"+module.stubsSourceModuleName(apiScope)) + ctx.AddVariationDependencies(nil, apiScope.stubsSourceTag, android.PrebuiltNameFromSource(module.stubsSourceModuleName(apiScope))) } } } diff --git a/java/system_modules.go b/java/system_modules.go index 8c69051ae..320a2bbbf 100644 --- a/java/system_modules.go +++ b/java/system_modules.go @@ -236,7 +236,7 @@ func (system *systemModulesImport) Prebuilt() *android.Prebuilt { // modules. func (system *systemModulesImport) ComponentDepsMutator(ctx android.BottomUpMutatorContext) { for _, lib := range system.properties.Libs { - ctx.AddVariationDependencies(nil, systemModulesLibsTag, "prebuilt_"+lib) + ctx.AddVariationDependencies(nil, systemModulesLibsTag, android.PrebuiltNameFromSource(lib)) } } |