Yes, it includes stock options, property, etc. Basically all compensation.
Source: https://calmatters.org/california-divide/2020/11/san-francis...
Source: https://calmatters.org/california-divide/2020/11/san-francis...
But he wasn't the highest paid exec. Sheryl Sandberg was, at $30M. Probably still not high enough to trigger the tax.