Use system bzip2 on iOS.

Use system bzip2 on iOS.


BUG=none
TEST=none


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=148118

[stuartmorgan, 2012-07-18 15:22:51]

GTK is doing this wrong; the right place for this is build/common.gypi (which is
where it is for us).

The change needed to this gyp file is to make system bzip2 work on iOS; turning
on the flag doesn't make sense without the gyp changes to make it work.

[stuartmorgan, 2012-07-20 13:30:59]

https://chromiumcodereview.appspot.com/10806010/diff/3001/build/common.gypi
File build/common.gypi (right):

https://chromiumcodereview.appspot.com/10806010/diff/3001/build/common.gypi#n...
build/common.gypi:831: ['OS == "ios"', {
There's already as ios section in this condition block; add it there.

(I suspect you need to sync your internal tree and take another look at this
file.)

https://chromiumcodereview.appspot.com/10806010/diff/3001/build/common.gypi#n...
build/common.gypi:832: 'use_system_bzip2': 1,
This should be 'use_system_bzip2%' (it's wrong internally)

https://chromiumcodereview.appspot.com/10806010/diff/3001/build/common.gypi#n...
build/common.gypi:835: 'mac_sdk': '10.7',
This has nothing to do with bzip2; it doesn't belong in this CL.

https://chromiumcodereview.appspot.com/10806010/diff/3001/third_party/bzip2/b...
File third_party/bzip2/bzip2.gyp (right):

https://chromiumcodereview.appspot.com/10806010/diff/3001/third_party/bzip2/b...
third_party/bzip2/bzip2.gyp:60: # There aren't any pkg-config files for libbz2
This should move into the else clause (so, 8 lines down). Also wrong internally.

[Milan Broum, 2012-07-24 02:03:38]

http://codereview.chromium.org/10806010/diff/3001/build/common.gypi
File build/common.gypi (right):

http://codereview.chromium.org/10806010/diff/3001/build/common.gypi#newcode831
build/common.gypi:831: ['OS == "ios"', {
On 2012/07/20 13:30:59, stuartmorgan wrote:
> There's already as ios section in this condition block; add it there.
> 
> (I suspect you need to sync your internal tree and take another look at this
> file.)

Done.

http://codereview.chromium.org/10806010/diff/3001/build/common.gypi#newcode832
build/common.gypi:832: 'use_system_bzip2': 1,
On 2012/07/20 13:30:59, stuartmorgan wrote:
> This should be 'use_system_bzip2%' (it's wrong internally)

Done.

http://codereview.chromium.org/10806010/diff/3001/build/common.gypi#newcode835
build/common.gypi:835: 'mac_sdk': '10.7',
On 2012/07/20 13:30:59, stuartmorgan wrote:
> This has nothing to do with bzip2; it doesn't belong in this CL.

Done.

http://codereview.chromium.org/10806010/diff/3001/third_party/bzip2/bzip2.gyp
File third_party/bzip2/bzip2.gyp (right):

http://codereview.chromium.org/10806010/diff/3001/third_party/bzip2/bzip2.gyp...
third_party/bzip2/bzip2.gyp:60: # There aren't any pkg-config files for libbz2
On 2012/07/20 13:30:59, stuartmorgan wrote:
> This should move into the else clause (so, 8 lines down). Also wrong
internally.

Done.

[stuartmorgan, 2012-07-24 08:42:04]

Something went wrong with the upload; I can't see the diffs. Can you upload
again?

[Milan Broum, 2012-07-24 09:54:25]

Re-uploaded. Should be OK now.

[stuartmorgan, 2012-07-24 09:58:24]

LGTM

[commit-bot: I haz the power, 2012-07-24 14:53:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/milanb@chromium.org/10806010/10003

[commit-bot: I haz the power, 2012-07-24 16:27:20]

Change committed as 148118