Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78ff835a authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Stop exporting java_sdk_library libs in the snapshot" am: 320055eb 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1697676

Change-Id: If21ded2582835f36062511d43d03aa2c10827cf4
parents e1fab6a3 320055eb

java/sdk_library.go

+0 −8
Original line number Diff line number Diff line
@@ -2386,9 +2386,6 @@ type sdkLibrarySdkMemberProperties struct { 
	// Scope to per scope properties.

	Scopes map[*apiScope]scopeProperties



	// Additional libraries that the exported stubs libraries depend upon.

	Libs []string



	// The Java stubs source files.

	Stub_srcs []string
@@ -2440,7 +2437,6 @@ func (s *sdkLibrarySdkMemberProperties) PopulateFromVariant(ctx android.SdkMembe 
		}

	}



	s.Libs = sdk.properties.Libs

	s.Naming_scheme = sdk.commonSdkLibraryProperties.Naming_scheme

	s.Shared_library = proptools.BoolPtr(sdk.sharedLibrary())

	s.Compile_dex = sdk.dexProperties.Compile_dex
@@ -2505,8 +2501,4 @@ func (s *sdkLibrarySdkMemberProperties) AddToPropertySet(ctx android.SdkMemberCo 
		}

		propertySet.AddProperty("doctag_files", dests)

	}



	if len(s.Libs) > 0 {

		propertySet.AddPropertyWithTag("libs", s.Libs, ctx.SnapshotBuilder().SdkMemberReferencePropertyTag(false))

	}

}