java_sdk_library: Propagate naming_scheme to snapshot

Bug: 155164730
Test: m nothing
Merged-In: Iec7c52d2102b6294540090f3c1e32bd9d8cc7da8
Change-Id: Iec7c52d2102b6294540090f3c1e32bd9d8cc7da8
(cherry picked from commit f7a6433bab)
This commit is contained in:
Paul Duffin
2020-05-13 16:54:55 +01:00
parent 57029c07bf
commit f8e08b20d6
2 changed files with 75 additions and 0 deletions

View File

@@ -1672,6 +1672,9 @@ type sdkLibrarySdkMemberProperties struct {
// The Java stubs source files.
Stub_srcs []string
// The naming scheme.
Naming_scheme *string
}
type scopeProperties struct {
@@ -1701,9 +1704,14 @@ func (s *sdkLibrarySdkMemberProperties) PopulateFromVariant(ctx android.SdkMembe
}
s.Libs = sdk.properties.Libs
s.Naming_scheme = sdk.commonProperties.Naming_scheme
}
func (s *sdkLibrarySdkMemberProperties) AddToPropertySet(ctx android.SdkMemberContext, propertySet android.BpPropertySet) {
if s.Naming_scheme != nil {
propertySet.AddProperty("naming_scheme", proptools.String(s.Naming_scheme))
}
for _, apiScope := range allApiScopes {
if properties, ok := s.Scopes[apiScope]; ok {
scopeSet := propertySet.AddPropertySet(apiScope.propertyName)