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

Commit e5949952 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Automerger Merge Worker
Browse files

Merge "Disable all host OS variants except those explicitly included." am:... 

Merge "Disable all host OS variants except those explicitly included." am: 42e6dabe am: 41bca360

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

Change-Id: I24f6af9a61230da29603112275a1727253ddb994
parents 7c7ae7d0 41bca360

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.

cc/binary_sdk_member.go

+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,

	},

}

cc/library_headers.go

+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,

cc/library_sdk_member.go

+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"},

sdk/cc_sdk_test.go

+426 −22

File changed.

Preview size limit exceeded, changes collapsed.