Merge "Apply native_bridge suffix to all cc_modules" (7636b362) · Commits · e / os / android_build_soong

android/androidmk.go

+0 −8

Original line number	Diff line number	Diff line
		@@ -28,10 +28,6 @@ import (
		"github.com/google/blueprint/bootstrap"
		)

		var (
		NativeBridgeSuffix = ".native_bridge"
		)

		func init() {
		RegisterSingletonType("androidmk", AndroidMkSingleton)
		}
		@@ -165,10 +161,6 @@ func (a *AndroidMkEntries) fillInEntries(config Config, bpPath string, mod bluep
		}
		}

		if amod.Target().NativeBridge {
		a.SubName += NativeBridgeSuffix
		}

		fmt.Fprintln(&a.header, "\ninclude $(CLEAR_VARS)")

		// Collect make variable assignment entries.

+7 −2

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import (
		)

		var (
		nativeBridgeSuffix = ".native_bridge"
		vendorSuffix = ".vendor"
		recoverySuffix = ".recovery"
		)
		@@ -105,6 +106,10 @@ func (c *Module) AndroidMk() android.AndroidMkData {
		}
		c.subAndroidMk(&ret, c.installer)

		if c.Target().NativeBridge == android.NativeBridgeEnabled {
		ret.SubName += nativeBridgeSuffix
		}

		if c.useVndk() && c.hasVendorVariant() {
		// .vendor suffix is added only when we will have two variants: core and vendor.
		// The suffix is not added for vendor-only module.

+1 −1

Original line number	Diff line number	Diff line
		@@ -1826,7 +1826,7 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
		} else if ccDep.inRecovery() && !ccDep.onlyInRecovery() {
		return libName + recoverySuffix
		} else if ccDep.Target().NativeBridge == android.NativeBridgeEnabled {
		return libName + android.NativeBridgeSuffix
		return libName + nativeBridgeSuffix
		} else {
		return libName
		}