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

Commit 88b15818 authored by Spandan Das's avatar Spandan Das Committed by Automerger Merge Worker
Browse files

Merge changes I4129c2a9,I9af06f81 am: 0bf4ea53 am: 56797fd5 

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



Change-Id: I197722f1c9fa8e31d0ddb3deba31fc875f161d01
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7ddf444d 56797fd5

android/apex.go

+10 −1
Original line number Diff line number Diff line
@@ -356,9 +356,18 @@ func (m *ApexModuleBase) apexModuleBase() *ApexModuleBase { 
	return m

}



var (

	availableToPlatformList = []string{AvailableToPlatform}

)



// Implements ApexModule

func (m *ApexModuleBase) ApexAvailable() []string {

	return m.ApexProperties.Apex_available

	aa := m.ApexProperties.Apex_available

	if len(aa) > 0 {

		return aa

	}

	// Default is availability to platform

	return CopyOf(availableToPlatformList)

}



// Implements ApexModule

android/mutator.go

+7 −1
Original line number Diff line number Diff line
@@ -747,7 +747,13 @@ func ApexAvailableTags(mod Module) bazel.StringListAttribute { 
		// TODO(b/218841706): hidl_interface has the apex_available prop, but it's

		// defined directly as a prop and not via ApexModule, so this doesn't

		// pick those props up.

		attr.Value = ConvertApexAvailableToTags(am.apexModuleBase().ApexAvailable())

		apexAvailable := am.apexModuleBase().ApexAvailable()

		// If a user does not specify apex_available in Android.bp, then soong provides a default.

		// To avoid verbosity of BUILD files, remove this default from user-facing BUILD files.

		if len(am.apexModuleBase().ApexProperties.Apex_available) == 0 {

			apexAvailable = []string{}

		}

		attr.Value = ConvertApexAvailableToTags(apexAvailable)

	}

	return attr

}