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

Commit 3fbe62b5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "vndkvariantcheck" 

* changes:
  vndkMustUseVendorVariant += libstagefright_bufferpool@2.0
  Emit LOCAL_CHECK_SAME_VNDK_VARIANTS
parents e24093a7 8c38ecba

cc/androidmk.go

+3 −0
Original line number Diff line number Diff line
@@ -217,6 +217,9 @@ func (library *libraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.An 
			fmt.Fprintln(w, "LOCAL_NO_NOTICE_FILE := true")

			fmt.Fprintln(w, "LOCAL_VNDK_DEPEND_ON_CORE_VARIANT := true")

		}

		if library.checkSameCoreVariant {

			fmt.Fprintln(w, "LOCAL_CHECK_SAME_VNDK_VARIANTS := true")

		}

	})



	if library.shared() && !library.buildStubs() {

cc/config/vndk.go

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ var VndkMustUseVendorVariantList = []string{ 
	"libsqlite",

	"libssl",

	"libstagefright_amrnb_common",

	"libstagefright_bufferpool@2.0",

	"libstagefright_bufferqueue_helper",

	"libstagefright_enc_common",

	"libstagefright_flacdec",

cc/library.go

+7 −3
Original line number Diff line number Diff line
@@ -386,6 +386,7 @@ type libraryDecorator struct { 
	// If useCoreVariant is true, the vendor variant of a VNDK library is

	// not installed.

	useCoreVariant       bool

	checkSameCoreVariant bool



	// Decorated interafaces

	*baseCompiler
@@ -1096,9 +1097,12 @@ func (library *libraryDecorator) install(ctx ModuleContext, file android.Path) { 
			if ctx.isVndkSp() {

				library.baseInstaller.subDir = "vndk-sp"

			} else if ctx.isVndk() {

				if ctx.DeviceConfig().VndkUseCoreVariant() && !ctx.mustUseVendorVariant() {

				if !ctx.mustUseVendorVariant() {

					library.checkSameCoreVariant = true

					if ctx.DeviceConfig().VndkUseCoreVariant() {

						library.useCoreVariant = true

					}

				}

				library.baseInstaller.subDir = "vndk"

			}