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

Commit c38936ad authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Gerrit Code Review
Browse files

Merge "Build against SDKs for native libs only for unbundled apps."

parents 0f688004 fd9eb4b8

android/config.go

+7 −0
Original line number Diff line number Diff line
@@ -712,10 +712,17 @@ func (c *config) AllowMissingDependencies() bool { 
	return Bool(c.productVariables.Allow_missing_dependencies)

}



// Returns true if building without full platform sources.

func (c *config) UnbundledBuild() bool {

	return Bool(c.productVariables.Unbundled_build)

}



// Returns true if building apps that aren't bundled with the platform.

// UnbundledBuild() is always true when this is true.

func (c *config) UnbundledBuildApps() bool {

	return Bool(c.productVariables.Unbundled_build_apps)

}



func (c *config) UnbundledBuildUsePrebuiltSdks() bool {

	return Bool(c.productVariables.Unbundled_build) && !Bool(c.productVariables.Unbundled_build_sdks_from_source)

}

android/variable.go

+1 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ type productVariables struct { 


	Allow_missing_dependencies       *bool `json:",omitempty"`

	Unbundled_build                  *bool `json:",omitempty"`

	Unbundled_build_apps             *bool `json:",omitempty"`

	Unbundled_build_sdks_from_source *bool `json:",omitempty"`

	Malloc_not_svelte                *bool `json:",omitempty"`

	Malloc_zero_contents             *bool `json:",omitempty"`

cc/sdk.go

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ func sdkMutator(ctx android.BottomUpMutatorContext) { 
			modules[0].(*Module).Properties.Sdk_version = nil

			modules[1].(*Module).Properties.IsSdkVariant = true



			if ctx.Config().UnbundledBuild() {

			if ctx.Config().UnbundledBuildApps() {

				modules[0].(*Module).Properties.HideFromMake = true

				modules[0].(*Module).Properties.PreventInstall = true

			} else {