Upstream: Android's base.gyp and base.gypi

Upstream: Android's base.gyp and base.gypi

- Added upstreamed files for Android platform.
- Excluded the files related to icu and JNI, because third_party/icu
  can't compiled and JNI files have been uploaded yet.

BUG=
TEST=

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

[michaelbai, 2011-09-28 19:41:41]

Hi Brett,

Please help to review this.

[brettw, 2011-09-28 19:49:28]

http://codereview.chromium.org/8065017/diff/1/base/base.gyp
File base/base.gyp (right):

http://codereview.chromium.org/8065017/diff/1/base/base.gyp#newcode30
base/base.gyp:30: # TODO(michaelbai): Override the dependencies to remove the
icu.gyp,
I don't understand this comment, I don't see anything about ICU here.

http://codereview.chromium.org/8065017/diff/1/base/base.gyp#newcode33
base/base.gyp:33: 'dependencies=': [
Why do we need these on Android and not other systems. The dependency on base
seems particularly strange.

http://codereview.chromium.org/8065017/diff/1/base/base.gypi
File base/base.gypi (right):

http://codereview.chromium.org/8065017/diff/1/base/base.gypi#newcode441
base/base.gypi:441: ['exclude', '^debug/stack_trace_android.cc'],
Why do you add this file only to exclude it?

http://codereview.chromium.org/8065017/diff/1/base/base.gypi#newcode444
base/base.gypi:444: 'files/file_path_watcher_stub.cc',
Why isn't this in the main list of all files above? Why is this different than
the include/exclude lines immediately preceeding?

[brettw, 2011-09-28 19:49:28]

http://codereview.chromium.org/8065017/diff/1/base/base.gyp
File base/base.gyp (right):

http://codereview.chromium.org/8065017/diff/1/base/base.gyp#newcode30
base/base.gyp:30: # TODO(michaelbai): Override the dependencies to remove the
icu.gyp,
I don't understand this comment, I don't see anything about ICU here.

http://codereview.chromium.org/8065017/diff/1/base/base.gyp#newcode33
base/base.gyp:33: 'dependencies=': [
Why do we need these on Android and not other systems. The dependency on base
seems particularly strange.

http://codereview.chromium.org/8065017/diff/1/base/base.gypi
File base/base.gypi (right):

http://codereview.chromium.org/8065017/diff/1/base/base.gypi#newcode441
base/base.gypi:441: ['exclude', '^debug/stack_trace_android.cc'],
Why do you add this file only to exclude it?

http://codereview.chromium.org/8065017/diff/1/base/base.gypi#newcode444
base/base.gypi:444: 'files/file_path_watcher_stub.cc',
Why isn't this in the main list of all files above? Why is this different than
the include/exclude lines immediately preceeding?

[michaelbai, 2011-09-28 21:22:10]

PTAL

http://codereview.chromium.org/8065017/diff/1/base/base.gyp
File base/base.gyp (right):

http://codereview.chromium.org/8065017/diff/1/base/base.gyp#newcode30
base/base.gyp:30: # TODO(michaelbai): Override the dependencies to remove the
icu.gyp,
It removed the base_i18n's dependence on 'icu' by overriding 'dependencies'

Refined the comment.

On 2011/09/28 19:49:28, brettw wrote:
> I don't understand this comment, I don't see anything about ICU here.

http://codereview.chromium.org/8065017/diff/1/base/base.gyp#newcode33
base/base.gyp:33: 'dependencies=': [
On 2011/09/28 19:49:28, brettw wrote:
> Why do we need these on Android and not other systems. The dependency on base
> seems particularly strange.


It because third_party/icu can not be built on Android now.

http://codereview.chromium.org/8065017/diff/1/base/base.gypi
File base/base.gypi (right):

http://codereview.chromium.org/8065017/diff/1/base/base.gypi#newcode441
base/base.gypi:441: ['exclude', '^debug/stack_trace_android.cc'],
Not sure I fully understood your question, All these files (below 'TODO') are
excluded temporarily and will be added back soon. 

On 2011/09/28 19:49:28, brettw wrote:
> Why do you add this file only to exclude it?

http://codereview.chromium.org/8065017/diff/1/base/base.gypi#newcode444
base/base.gypi:444: 'files/file_path_watcher_stub.cc',
On 2011/09/28 19:49:28, brettw wrote:
> Why isn't this in the main list of all files above? Why is this different than
> the include/exclude lines immediately preceeding?

I check it again, it seemed that this file has been included in line 487.

Removed.

[brettw, 2011-09-28 21:38:49]

http://codereview.chromium.org/8065017/diff/1/base/base.gypi
File base/base.gypi (right):

http://codereview.chromium.org/8065017/diff/1/base/base.gypi#newcode444
base/base.gypi:444: 'files/file_path_watcher_stub.cc',
The style is to have all files in the main list, and then exclude the ones you
don't want on certain platforms.

http://codereview.chromium.org/8065017/diff/3003/base/base.gyp
File base/base.gyp (right):

http://codereview.chromium.org/8065017/diff/3003/base/base.gyp#newcode33
base/base.gyp:33: # 'dependencies', third_party/icu can be compiled on Android
now.
This sentence doesn't make any sense.

http://codereview.chromium.org/8065017/diff/3003/base/base.gyp#newcode34
base/base.gyp:34: 'dependencies=': [
You seem to be writing this assuming that this will override and replace the
dependencies defined in the topmost section. But if that were true, wouldn't
toolkit_uses_gtk then not have ICU or even base? This ends up merging the
dependencies.

[michaelbai, 2011-09-28 21:45:36]

http://codereview.chromium.org/8065017/diff/3003/base/base.gyp
File base/base.gyp (right):

http://codereview.chromium.org/8065017/diff/3003/base/base.gyp#newcode34
base/base.gyp:34: 'dependencies=': [
Yes, To completely remove the ICU is what I want now because the third_party/icu
can not be compiled now.

On 2011/09/28 21:38:49, brettw wrote:
> You seem to be writing this assuming that this will override and replace the
> dependencies defined in the topmost section. But if that were true, wouldn't
> toolkit_uses_gtk then not have ICU or even base? This ends up merging the
> dependencies.

[brettw, 2011-09-28 21:47:50]

http://codereview.chromium.org/8065017/diff/3003/base/base.gyp
File base/base.gyp (right):

http://codereview.chromium.org/8065017/diff/3003/base/base.gyp#newcode34
base/base.gyp:34: 'dependencies=': [
On 2011/09/28 21:45:36, michaelbai wrote:
> Yes, To completely remove the ICU is what I want now because the
third_party/icu
> can not be compiled now.

As I explained in the comment, what you wrote does not override and replace the
dependencies in the topmost section. It merges.

[michaelbai, 2011-09-28 23:04:34]

http://codereview.chromium.org/8065017/diff/1/base/base.gypi
File base/base.gypi (right):

http://codereview.chromium.org/8065017/diff/1/base/base.gypi#newcode444
base/base.gypi:444: 'files/file_path_watcher_stub.cc',
On 2011/09/28 21:38:49, brettw wrote:
> The style is to have all files in the main list, and then exclude the ones you
> don't want on certain platforms.

Done.

http://codereview.chromium.org/8065017/diff/3003/base/base.gyp
File base/base.gyp (right):

http://codereview.chromium.org/8065017/diff/3003/base/base.gyp#newcode33
base/base.gyp:33: # 'dependencies', third_party/icu can be compiled on Android
now.
On 2011/09/28 21:38:49, brettw wrote:
> This sentence doesn't make any sense.

Done.

http://codereview.chromium.org/8065017/diff/3003/base/base.gyp#newcode34
base/base.gyp:34: 'dependencies=': [
As we discussed, I changed to use exclude list

On 2011/09/28 21:47:50, brettw wrote:
> On 2011/09/28 21:45:36, michaelbai wrote:
> > Yes, To completely remove the ICU is what I want now because the
> third_party/icu
> > can not be compiled now.
> 
> As I explained in the comment, what you wrote does not override and replace
the
> dependencies in the topmost section. It merges.

[michaelbai, 2011-09-29 16:05:41]

PTAL

[brettw, 2011-09-30 23:11:27]

lgtm