Removed extra CODE_ANALYSIS constant
Re-ordered build