StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename apiScope.stubsTag" into main

Browse Source
This commit is contained in:
Jihoon Kang
2024-01-23 01:43:55 +00:00
committed by Gerrit Code Review
parent 7f55a63222 b743155a26
commit fbe572b064
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/sdk_library.go
View File

@@ -104,9 +104,8 @@ type apiScope struct {
// The name of the property in the java_sdk_library_import // The name of the property in the java_sdk_library_import
propertyName string propertyName string
// The tag to use to depend on the stubs library module if the parent module // The tag to use to depend on the prebuilt stubs library module
// does not differentiate everything and exportable stubs (e.g. sdk_library_import). prebuiltStubsTag scopeDependencyTag
stubsTag scopeDependencyTag
// The tag to use to depend on the everything stubs library module. // The tag to use to depend on the everything stubs library module.
everythingStubsTag scopeDependencyTag everythingStubsTag scopeDependencyTag
@@ -174,7 +173,7 @@ func initApiScope(scope *apiScope) *apiScope {
allScopeNames = append(allScopeNames, name) allScopeNames = append(allScopeNames, name)
scope.propertyName = strings.ReplaceAll(name, "-", "_") scope.propertyName = strings.ReplaceAll(name, "-", "_")
scope.fieldName = proptools.FieldNameForProperty(scope.propertyName) scope.fieldName = proptools.FieldNameForProperty(scope.propertyName)
scope.stubsTag = scopeDependencyTag{ scope.prebuiltStubsTag = scopeDependencyTag{
name: name + "-stubs", name: name + "-stubs",
apiScope: scope, apiScope: scope,
depInfoExtractor: (*scopePaths).extractStubsLibraryInfoFromDependency, depInfoExtractor: (*scopePaths).extractStubsLibraryInfoFromDependency,
@@ -2739,7 +2738,7 @@ func (module *SdkLibraryImport) ComponentDepsMutator(ctx android.BottomUpMutator
} }
// Add dependencies to the prebuilt stubs library // Add dependencies to the prebuilt stubs library
ctx.AddVariationDependencies(nil, apiScope.stubsTag, android.PrebuiltNameFromSource(module.stubsLibraryModuleName(apiScope))) ctx.AddVariationDependencies(nil, apiScope.prebuiltStubsTag, android.PrebuiltNameFromSource(module.stubsLibraryModuleName(apiScope)))
if len(scopeProperties.Stub_srcs) > 0 { if len(scopeProperties.Stub_srcs) > 0 {
// Add dependencies to the prebuilt stubs source library // Add dependencies to the prebuilt stubs source library