From f8e08b20d6f36e818d2bc812c49fc0406a434f6d Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 13 May 2020 16:54:55 +0100 Subject: java_sdk_library: Propagate naming_scheme to snapshot Bug: 155164730 Test: m nothing Merged-In: Iec7c52d2102b6294540090f3c1e32bd9d8cc7da8 Change-Id: Iec7c52d2102b6294540090f3c1e32bd9d8cc7da8 (cherry picked from commit f7a6433babd6495813ab4aacf4ca73ae2ce7bb4e) --- java/sdk_library.go | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'java/sdk_library.go') diff --git a/java/sdk_library.go b/java/sdk_library.go index 24a88d323..7e81c1e33 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -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) -- cgit v1.2.3-59-g8ed1b