Merge "Disable all host OS variants except those explicitly included." am: 42e6dabe81 (41bca360) · Commits · e / os / android_build_soong

android/sdk.go

+11 −0

Original line number	Diff line number	Diff line
		@@ -327,6 +327,12 @@ type SdkMemberType interface {
		// SdkAware and be added with an SdkMemberTypeDependencyTag tag.
		HasTransitiveSdkMembers() bool

		// Return true if prebuilt host artifacts may be specific to the host OS. Only
		// applicable to modules where HostSupported() is true. If this is true,
		// snapshots will list each host OS variant explicitly and disable all other
		// host OS'es.
		IsHostOsDependent() bool

		// Add dependencies from the SDK module to all the module variants the member
		// type contributes to the SDK. `names` is the list of module names given in
		// the member type property (as returned by SdkPropertyName()) in the SDK
		@@ -389,6 +395,7 @@ type SdkMemberTypeBase struct {
		PropertyName string
		SupportsSdk bool
		TransitiveSdkMembers bool
		HostOsDependent bool
		}

		func (b *SdkMemberTypeBase) SdkPropertyName() string {
		@@ -403,6 +410,10 @@ func (b *SdkMemberTypeBase) HasTransitiveSdkMembers() bool {
		return b.TransitiveSdkMembers
		}

		func (b *SdkMemberTypeBase) IsHostOsDependent() bool {
		return b.HostOsDependent
		}

		// Encapsulates the information about registered SdkMemberTypes.
		type SdkMemberTypesRegistry struct {
		// The list of types sorted by property name.

+2 −1

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ func init() {
		var ccBinarySdkMemberType = &binarySdkMemberType{
		SdkMemberTypeBase: android.SdkMemberTypeBase{
		PropertyName: "native_binaries",
		HostOsDependent: true,
		},
		}

+3 −2

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ var headersLibrarySdkMemberType = &librarySdkMemberType{
		SdkMemberTypeBase: android.SdkMemberTypeBase{
		PropertyName: "native_header_libs",
		SupportsSdk: true,
		HostOsDependent: true,
		},
		prebuiltModuleType: "cc_prebuilt_library_headers",
		noOutputFiles: true,

+9 −6

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ var sharedLibrarySdkMemberType = &librarySdkMemberType{
		SdkMemberTypeBase: android.SdkMemberTypeBase{
		PropertyName: "native_shared_libs",
		SupportsSdk: true,
		HostOsDependent: true,
		},
		prebuiltModuleType: "cc_prebuilt_library_shared",
		linkTypes: []string{"shared"},
		@@ -38,6 +39,7 @@ var staticLibrarySdkMemberType = &librarySdkMemberType{
		SdkMemberTypeBase: android.SdkMemberTypeBase{
		PropertyName: "native_static_libs",
		SupportsSdk: true,
		HostOsDependent: true,
		},
		prebuiltModuleType: "cc_prebuilt_library_static",
		linkTypes: []string{"static"},
		@@ -47,6 +49,7 @@ var staticAndSharedLibrarySdkMemberType = &librarySdkMemberType{
		SdkMemberTypeBase: android.SdkMemberTypeBase{
		PropertyName: "native_libs",
		SupportsSdk: true,
		HostOsDependent: true,
		},
		prebuiltModuleType: "cc_prebuilt_library",
		linkTypes: []string{"static", "shared"},

+426 −22

File changed.

Preview size limit exceeded, changes collapsed.