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

Commit d31098e6 authored by Yu Liu's avatar Yu Liu Committed by Gerrit Code Review
Browse files

Merge "Allow cfi enabled modules in mixed build."

parents 95c78ef9 95497dc8

cc/cc.go

+2 −1
Original line number Diff line number Diff line
@@ -1928,7 +1928,6 @@ func allEnabledSanitizersSupportedByBazel(c *Module) bool { 


	unsupportedSanitizers := []*bool{

		sanitizeProps.Safestack,

		sanitizeProps.Cfi,

		sanitizeProps.Scudo,

		BoolPtr(len(c.sanitize.Properties.Sanitize.Recover) > 0),

		BoolPtr(c.sanitize.Properties.Sanitize.Blocklist != nil),
@@ -1947,6 +1946,8 @@ func allEnabledSanitizersSupportedByBazel(c *Module) bool { 
			if ubsanEnabled && !c.MinimalRuntimeNeeded() {

				return false

			}

		} else if san == cfi {

			continue

		} else if c.sanitize.isSanitizerEnabled(san) {

			return false

		}

cc/cc_test.go

+1 −1
Original line number Diff line number Diff line
@@ -5538,7 +5538,7 @@ func TestDisableSanitizerVariantsInMixedBuilds(t *testing.T) { 
			name:    "foo_cfi",

			variant: "android_arm64_armv8-a_static_cfi_apex28",

			expectedOutputPaths: []string{

				"out/soong/.intermediates/foo_cfi/android_arm64_armv8-a_static_cfi_apex28/foo_cfi.a",

				"outputbase/execroot/__main__/foo_cfi.a",

			},

		},

		{