soaap-ninja-v42.diff

--- out/Release/build.ninja.orig	2015-08-09 19:12:08.217964844 +0000
+++ out/Release/build.ninja	2015-08-09 19:48:16.406815149 +0000
@@ -1,16 +1,33 @@
-cc = cc
-cxx = c++
+soaap_llvm_path = /replace/with/your/SOAAP/llvm
+soaap_build_path = /replace/with/your/SOAAP/builddir
+soaap_chromium_path = /replace/with/your/SOAAP/chromium
+
+cc = $soaap_llvm_path/bin/clang
+cxx = $soaap_llvm_path/bin/clang++ -stdlib=libc++
 ld = $cc
 ldxx = $cxx
 ar = /usr/bin/ar
 nm = nm
 readelf = readelf
 
+llc = $soaap_llvm_path/bin/llc
+llvm_file_map = $soaap_chromium_path/llvm-file-map
+llvm_link_wrapper = $soaap_chromium_path/llvm-link-wrapper
+soaap_binary = $soaap_build_path/bin/soaap
+soaap_include_dir = $soaap_build_path/include
+
+SOAAP_FLAGS = $
+  -soaap-analyses=vulnerability,infoflow $
+  -soaap-output-traces=vulnerability,infoflow -soaap-pedantic $
+  -soaap-pretty-print=false -soaap-emit-leaked-rights=false $
+  -soaap-report-file-prefix=chrome.soaap -soaap-report-output-formats=json $
+  -soaap-sandbox-platform=capsicum
+
 pool link_pool
   depth = 1
 
 rule cc
-  command = $cc -MMD -MF $out.d $defines $includes $cflags $cflags_c $cflags_pch_c -c $in -o $out
+  command = $cc -MMD -MF $out.d $defines $includes -I$soaap_include_dir $cflags $cflags_c $cflags_pch_c -c $in -o $out && $cc -DSOAAP -MMD -MF $out.d $defines $includes `echo $cflags | sed 's/O2/O0/g'` `echo $cflags_c | sed 's/O2/O0/g'` `echo $cflags_pch_c | sed 's/O2/O0/g'` -I$soaap_include_dir -c $in -gline-tables-only -emit-llvm -o $out.bc
   description = CC $out
   depfile = $out.d
   deps = gcc
@@ -18,15 +35,15 @@
   command = $cc $defines $includes $cflags $cflags_c $cflags_pch_c -c $in -o $out
   description = CC $out
 rule cxx
-  command = $cxx -MMD -MF $out.d $defines $includes $cflags $cflags_cc $cflags_pch_cc -c $in -o $out
+  command = $cxx -MMD -MF $out.d $defines $includes -I$soaap_include_dir $cflags $cflags_cc $cflags_pch_cc -c $in -o $out && $cxx -MMD -MF $out.d $defines $includes `echo $cflags | sed 's/O2/O0/g'` `echo $cflags_cc | sed 's/O2/O0/g' | sed 's/-fno-rtti//g'` `echo $cflags_pch_cc | sed 's/O2/O0/g'` -c $in -gline-tables-only -gsoaap -emit-llvm -DSOAAP -I$soaap_include_dir -o $out.bc
   description = CXX $out
   depfile = $out.d
   deps = gcc
 rule alink
-  command = rm -f $out && $ar rcs $arflags $out $in
+  command = rm -f $out && $ar rcs $out $in && rm -f $out.bc && $llvm_link_wrapper $out.bc `$llvm_file_map $in`
   description = AR $out
 rule alink_thin
-  command = rm -f $out && $ar rcsT $arflags $out $in
+  command = rm -f $out && $ar rcsT $out $in && rm -f $out.bc && $llvm_link_wrapper $out.bc `$llvm_file_map $in`
   description = AR $out
 rule solink
   command = if [ ! -e $lib -o ! -e $lib.TOC ]; then $ld -shared $ldflags -o $lib -Wl,-soname=$soname @$link_file_list $
@@ -49,7 +66,7 @@
   rspfile = $link_file_list
   rspfile_content = -Wl,--start-group $in -Wl,--end-group $solibs $libs
 rule link
-  command = $ld $ldflags -o $out -Wl,--start-group $in -Wl,--end-group $solibs $libs
+  command = $ld $ldflags -o $out -Wl,--start-group $in $solibs -Wl,--end-group $libs && $llvm_link_wrapper $out.bc `$llvm_file_map $in`
   description = LINK $out
   pool = link_pool
 rule stamp
@@ -58,6 +75,22 @@
 rule copy
   command = ln -f $in $out 2>/dev/null || (rm -rf $out && cp -af $in $out)
   description = COPY $in $out
+rule llc
+  command = $llc -filetype=obj $in
+  description = LLC $out
+rule chromebclink
+  command = $ld -B /usr/local/bin -Wl,-z,now -Wl,-z,relro -Wl,--unresolved-symbols=ignore-all -pthread -Wl,-z,noexecstack -fPIC -Wl,--no-keep-memory -L. -L/usr/local/lib -L/usr/local/lib/nss -Wl,-O1 -Wl,--as-needed -o $out $in -lX11 -lXcursor -lXrender -lXss -lXext -L/usr/local/lib -lexecinfo -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lintl -lXtst -lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -lXinerama -lXi -lXrandr -lXcomposite -lXdamage -lXfixes -latk-1.0 -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lpangoft2-1.0 -lpango-1.0 -lfreetype -lfontconfig -lnss3 -lsmime3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -lasound -lxml2 -lxslt -lz -liconv -lm -lcups -lssl -lcrypto -pthread -lcrypt -lssp_nonshared -L/usr/local/lib -lgcrypt -lgpg-error -lexpat -lusb -ldbus-1 `cat objfiles.txt | xargs`
+  description = CHROME_BCLINK $out
+rule demangle
+  command = cat $in | c++filt > $out
+  description = Demangling $in
+rule soaap
+  command = $soaap_binary ${SOAAP_FLAGS} $in
+  description = SOAAP $in
+  pool = console
+rule xz
+  command = xz --force --keep $in > $out
+  description = Compressing $in
 
 subninja obj/third_party/mojo/mojo_utility.ninja
 subninja obj/remoting/remoting_webapp_html.ninja
@@ -1126,6 +1158,16 @@
 subninja obj/build/aura_builder.ninja
 subninja obj/build/chromium_builder_webrtc.ninja
 
+# SOAAP-related targets
+build chrome.o : llc chrome.bc
+build chrome.bc : phony chrome
+build chrome.bc.exe : chromebclink chrome.o
+build chrome.soaap.json : soaap chrome.bc
+build chrome.soaap.demangled.json : demangle chrome.soaap.json
+build chrome.soaap.demangled.json.xz : xz chrome.soaap.demangled.json
+build chrome.dbcsoaap : soaap chrome.dbc
+build soaap : phony chrome.soaap.demangled.json.xz
+
 # Short names for targets.
 build blink_web: phony obj/third_party/WebKit/Source/web/libblink_web.a
 build chromium_builder_asan: phony obj/build/chromium_builder_asan.actions_depends.stamp
--- out/Release/obj/chrome/chrome_initial.ninja 2015-05-04 16:29:04.688642414 -0230
+++ out/Release/obj/chrome/chrome_initial.ninja.orig    2015-05-04 16:29:02.420645589 -0230
@@ -911,7 +911,6 @@
     -lspeechd -lusb -lFLAC -lspeex -ldbus-1 -lgtk-x11-2.0 -lgdk-x11-2.0 $
     -latk-1.0 -lgdk_pixbuf-2.0
 build chrome: link $
-    obj/content/public/common/chrome_initial.content_switches.o $
     obj/chrome/app/chrome_initial.chrome_exe_main_aura.o $
     obj/chrome/app/chrome_initial.chrome_main.o $
     obj/chrome/app/chrome_initial.chrome_main_delegate.o $