Merge "Change PRODUCT_CFI_INCLUDE_PATHS to opt-out (Soong)" am: 3ab49a2927

am: e792bc5091

Change-Id: Ic9bbacb80d6da98d7d5447dff34f6f2703baf36b

cc/sanitize.go

@@ -226,9 +226,13 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
 
 	// Enable CFI for all components in the include paths
 	if s.Cfi == nil && ctx.Config().CFIEnabledForPath(ctx.ModuleDir()) {
-		s.Cfi = boolPtr(true)
-		if inList("cfi", ctx.Config().SanitizeDeviceDiag()) {
-			s.Diag.Cfi = boolPtr(true)
+		// Do not rely on include paths for anything other than ARM64.
+		// TODO: Relax this constraint for 2019.
+		if ctx.Arch().ArchType == android.Arm64 {
+			s.Cfi = boolPtr(true)
+			if inList("cfi", ctx.Config().SanitizeDeviceDiag()) {
+				s.Diag.Cfi = boolPtr(true)
+			}
 		}
 	}