Fix for iOS build after r231478.

Fix for iOS build after r231478.

This adds dependencies on ui_unittests target to make iOS happy again.

BUG=299841
TEST=None
R=lliabraa@chromium.org, ben@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=232841

[lliabraa, 2013-10-31 11:58:41]

the try job shows some cycles to work out.

https://chromiumcodereview.appspot.com/54583002/diff/1/build/all.gyp
File build/all.gyp (right):

https://chromiumcodereview.appspot.com/54583002/diff/1/build/all.gyp#newcode78
build/all.gyp:78: '../ui/ui_unittests.gyp:ui_unittests',
remove this

https://chromiumcodereview.appspot.com/54583002/diff/1/ui/ui.gyp
File ui/ui.gyp (right):

https://chromiumcodereview.appspot.com/54583002/diff/1/ui/ui.gyp#newcode340
ui/ui.gyp:340: 'ui_unittests.gyp:ui_unittests',
We only need to add this dependency in one place and I think this is more
appropriate than build/all.gyp because it is local to ui/

[lliabraa, 2013-10-31 12:04:18]

On 2013/10/31 11:58:41, lliabraa wrote:
> the try job shows some cycles to work out.
> 
> https://chromiumcodereview.appspot.com/54583002/diff/1/build/all.gyp
> File build/all.gyp (right):
> 
> https://chromiumcodereview.appspot.com/54583002/diff/1/build/all.gyp#newcode78
> build/all.gyp:78: '../ui/ui_unittests.gyp:ui_unittests',
> remove this
> 
> https://chromiumcodereview.appspot.com/54583002/diff/1/ui/ui.gyp
> File ui/ui.gyp (right):
> 
> https://chromiumcodereview.appspot.com/54583002/diff/1/ui/ui.gyp#newcode340
> ui/ui.gyp:340: 'ui_unittests.gyp:ui_unittests',
> We only need to add this dependency in one place and I think this is more
> appropriate than build/all.gyp because it is local to ui/

Is shell_dialogs something that ios needs? It seems to be the source of the
dependency cycle

[tfarina, 2013-10-31 13:13:00]

On 2013/10/31 12:04:18, lliabraa wrote:
> On 2013/10/31 11:58:41, lliabraa wrote:
> > the try job shows some cycles to work out.
> > 
> > https://chromiumcodereview.appspot.com/54583002/diff/1/build/all.gyp
> > File build/all.gyp (right):
> > 
> >
https://chromiumcodereview.appspot.com/54583002/diff/1/build/all.gyp#newcode78
> > build/all.gyp:78: '../ui/ui_unittests.gyp:ui_unittests',
> > remove this
> > 
> > https://chromiumcodereview.appspot.com/54583002/diff/1/ui/ui.gyp
> > File ui/ui.gyp (right):
> > 
> > https://chromiumcodereview.appspot.com/54583002/diff/1/ui/ui.gyp#newcode340
> > ui/ui.gyp:340: 'ui_unittests.gyp:ui_unittests',
> > We only need to add this dependency in one place and I think this is more
> > appropriate than build/all.gyp because it is local to ui/
> 
> Is shell_dialogs something that ios needs? It seems to be the source of the
> dependency cycle

I don't think ios needs shell_dialogs.

[lliabraa, 2013-10-31 16:55:01]

On 2013/10/31 13:13:00, tfarina wrote:
> On 2013/10/31 12:04:18, lliabraa wrote:
> > On 2013/10/31 11:58:41, lliabraa wrote:
> > > the try job shows some cycles to work out.
> > > 
> > > https://chromiumcodereview.appspot.com/54583002/diff/1/build/all.gyp
> > > File build/all.gyp (right):
> > > 
> > >
> https://chromiumcodereview.appspot.com/54583002/diff/1/build/all.gyp#newcode78
> > > build/all.gyp:78: '../ui/ui_unittests.gyp:ui_unittests',
> > > remove this
> > > 
> > > https://chromiumcodereview.appspot.com/54583002/diff/1/ui/ui.gyp
> > > File ui/ui.gyp (right):
> > > 
> > >
https://chromiumcodereview.appspot.com/54583002/diff/1/ui/ui.gyp#newcode340
> > > ui/ui.gyp:340: 'ui_unittests.gyp:ui_unittests',
> > > We only need to add this dependency in one place and I think this is more
> > > appropriate than build/all.gyp because it is local to ui/
> > 
> > Is shell_dialogs something that ios needs? It seems to be the source of the
> > dependency cycle
> 
> I don't think ios needs shell_dialogs.

ping? The waterfall may be green but the iOS builds are broken.

[tfarina, 2013-10-31 17:27:39]

On 2013/10/31 16:55:01, lliabraa wrote:
> On 2013/10/31 13:13:00, tfarina wrote:
> > On 2013/10/31 12:04:18, lliabraa wrote:
> > > On 2013/10/31 11:58:41, lliabraa wrote:
> > > > the try job shows some cycles to work out.
> > > > 
> > > > https://chromiumcodereview.appspot.com/54583002/diff/1/build/all.gyp
> > > > File build/all.gyp (right):
> > > > 
> > > >
> >
https://chromiumcodereview.appspot.com/54583002/diff/1/build/all.gyp#newcode78
> > > > build/all.gyp:78: '../ui/ui_unittests.gyp:ui_unittests',
> > > > remove this
> > > > 
> > > > https://chromiumcodereview.appspot.com/54583002/diff/1/ui/ui.gyp
> > > > File ui/ui.gyp (right):
> > > > 
> > > >
> https://chromiumcodereview.appspot.com/54583002/diff/1/ui/ui.gyp#newcode340
> > > > ui/ui.gyp:340: 'ui_unittests.gyp:ui_unittests',
> > > > We only need to add this dependency in one place and I think this is
more
> > > > appropriate than build/all.gyp because it is local to ui/
> > > 
> > > Is shell_dialogs something that ios needs? It seems to be the source of
the
> > > dependency cycle
> > 
> > I don't think ios needs shell_dialogs.
> 
> ping? The waterfall may be green but the iOS builds are broken.

Is enough the build/all.gyp change? If not, revert the patch, I'm at work right
now, without access to my dev machine.

Thanks!

[tfarina, 2013-10-31 17:29:32]

lliabraa, note that if you find a fix, you can upload it here, and land it from
here as well.

You are a dev too, no? You do have access to iOS build, no?

[tfarina, 2013-10-31 22:24:22]

So Lane, what we gonna do?

On Thu, Oct 31, 2013 at 3:29 PM,  <tfarina@chromium.org> wrote:
> lliabraa, note that if you find a fix, you can upload it here, and land it
> from
> here as well.
>
> You are a dev too, no? You do have access to iOS build, no?
>
> https://codereview.chromium.org/54583002/



-- 
Thiago

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[tfarina, 2013-11-01 15:28:42]

Lane, I have other changes to ui.gyp (and this is blocking them), so I need a
resolution here.

Can we reach a consensun on what we gonna do?

[lliabraa, 2013-11-01 15:49:53]

On 2013/11/01 15:28:42, tfarina wrote:
> Lane, I have other changes to ui.gyp (and this is blocking them), so I need a
> resolution here.
> 
> Can we reach a consensun on what we gonna do?

If you add OS=iOS in your gyp environment you can ensure that the gyp is okay.
Then run git try -c -b ios_simulator_dbg to ensure the ui_inittest is built.

[tfarina, 2013-11-01 21:48:24]

On Fri, Nov 1, 2013 at 1:49 PM,  <lliabraa@chromium.org> wrote:
> If you add OS=iOS in your gyp environment you can ensure that the gyp is
> okay.
is it like this?
build/gyp_chromium -D OS=iOS --check?

Updating projects from gyp files...
Using overrides found in /home/tfarina/.gyp/include.gypi
gyp: Undefined variable yasm_path in
/home/tfarina/chromium/src/third_party/libjpeg_turbo/libjpeg.gyp

-- 
Thiago

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[tfarina, 2013-11-01 21:58:54]

Lane, take another look?

I think the change to all.gyp will be enough.

[lliabraa, 2013-11-04 14:42:36]

LGTM...the ui_unittests.app is being generated now. thanks for fixing this.

[commit-bot: I haz the power, 2013-11-04 15:10:36]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/54583002/210001

[commit-bot: I haz the power, 2013-11-04 17:45:18]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/54583002/210001

[tfarina, 2013-11-04 23:55:33]

Committed patchset #2 manually as r232841 (presubmit successful).