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

Commit 81235ffb authored by Inseob Kim's avatar Inseob Kim
Browse files

Set stem and suffix for vndk prebuilt libraries 

This is to pass check_elf_files when vendor modules link against vndk
prebuilts. Because of the ".vendor" suffix, the intermediate path
becomes "libfoo.vendor.so" and it makes check_elf_files fail, when stem
and suffix is not specified.

Also, by adding such fields, devices with empty BOARD_VNDK_VERSION can
experience a build break due to collision between VNDK snapshot and VNDK
source module. To completely prevent such collision, all vndk snapshots
become explicitly uninstallable, and they are disabled if
BOARD_VNDK_VERSION is empty.

Test: build/soong/build_test.bash
Change-Id: I54a0f33fd0b84ab9376ee3d75b83113b94bbacae
parent 38da41c2

cc/androidmk.go

+12 −0
Original line number Diff line number Diff line
@@ -487,9 +487,21 @@ func (c *vndkPrebuiltLibraryDecorator) AndroidMkEntries(ctx AndroidMkContext, en 
	entries.ExtraEntries = append(entries.ExtraEntries, func(entries *android.AndroidMkEntries) {

		c.libraryDecorator.androidMkWriteExportedFlags(entries)



		// Specifying stem is to pass check_elf_files when vendor modules link against vndk prebuilt.

		// We can't use install path because VNDKs are not installed. Instead, Srcs is directly used.

		_, file := filepath.Split(c.properties.Srcs[0])

		stem, suffix, ext := android.SplitFileExt(file)

		entries.SetString("LOCAL_BUILT_MODULE_STEM", "$(LOCAL_MODULE)"+ext)

		entries.SetString("LOCAL_MODULE_SUFFIX", suffix)

		entries.SetString("LOCAL_MODULE_STEM", stem)



		if c.tocFile.Valid() {

			entries.SetString("LOCAL_SOONG_TOC", c.tocFile.String())

		}



		// VNDK libraries available to vendor are not installed because

		// they are packaged in VNDK APEX and installed by APEX packages (apex/apex.go)

		entries.SetBool("LOCAL_UNINSTALLABLE_MODULE", true)

	})

}

cc/vndk_prebuilt.go

+8 −0
Original line number Diff line number Diff line
@@ -232,6 +232,14 @@ func vndkPrebuiltSharedLibrary() *Module { 
		&prebuilt.properties,

	)



	android.AddLoadHook(module, func(ctx android.LoadHookContext) {

		// empty BOARD_VNDK_VERSION implies that the device won't support

		// system only OTA. In this case, VNDK snapshots aren't needed.

		if ctx.DeviceConfig().VndkVersion() == "" {

			ctx.Module().Disable()

		}

	})



	return module

}