Merge "Do not hide VNDK prebuilts from make" (07f37120) · Commits · e / os / android_build_soong

cc/androidmk.go

+1 −4

Original line number	Diff line number	Diff line
		@@ -413,12 +413,9 @@ func (c llndkStubDecorator) AndroidMk(ctx AndroidMkContext, ret android.Androi
		}

		func (c vndkPrebuiltLibraryDecorator) AndroidMk(ctx AndroidMkContext, ret android.AndroidMkData) {
		// Each vndk prebuilt is exported to androidMk only when BOARD_VNDK_VERSION != current
		// and the version of the prebuilt is same as BOARD_VNDK_VERSION.
		ret.Class = "SHARED_LIBRARIES"

		// shouldn't add any suffixes due to mk modules
		ret.SubName = ""
		ret.SubName = c.androidMkSuffix

		ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) {
		c.libraryDecorator.androidMkWriteExportedFlags(w)

+9 −10

Original line number	Diff line number	Diff line
		@@ -73,6 +73,7 @@ type vndkPrebuiltProperties struct {
		type vndkPrebuiltLibraryDecorator struct {
		*libraryDecorator
		properties vndkPrebuiltProperties
		androidMkSuffix string
		}

		func (p *vndkPrebuiltLibraryDecorator) Name(name string) string {
		@@ -153,6 +154,13 @@ func (p *vndkPrebuiltLibraryDecorator) link(ctx ModuleContext,
		p.tocFile = android.OptionalPathForPath(tocFile)
		TransformSharedObjectToToc(ctx, in, tocFile, builderFlags)

		p.androidMkSuffix = p.NameSuffix()

		vndkVersion := ctx.DeviceConfig().VndkVersion()
		if vndkVersion == p.version() {
		p.androidMkSuffix = ""
		}

		return in
		}

		@@ -224,15 +232,6 @@ func vndkPrebuiltSharedLibrary() *Module {
		&prebuilt.properties,
		)

		android.AddLoadHook(module, func(ctx android.LoadHookContext) {
		// Only vndk snapshots of BOARD_VNDK_VERSION will be used when building.
		if prebuilt.version() != ctx.DeviceConfig().VndkVersion() {
		module.SkipInstall()
		module.Properties.HideFromMake = true
		return
		}
		})

		return module
		}