[android] Migrate more configs to gyp.

[android] Migrate more configs to gyp.

BUG=chromium:502176
LOG=n

Committed: https://crrev.com/174869573e42c999da1489c264b9c4602b98ba31
Cr-Commit-Position: refs/heads/master@{#29314}

[Michael Achenbach, 2015-06-24 14:47:45]

machenbach@chromium.org changed reviewers:
+ jochen@chromium.org, ulan@chromium.org

[Michael Achenbach, 2015-06-24 14:53:12]

The CQ bit was checked by machenbach@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2015-06-24 14:53:28]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1207693004/1

[Michael Achenbach, 2015-06-24 14:53:32]

PTAL

https://codereview.chromium.org/1207693004/diff/1/Makefile.android
File Makefile.android (left):

https://codereview.chromium.org/1207693004/diff/1/Makefile.android#oldcode47
Makefile.android:47: DEFINES += android_target_arch=mips
mips_arch_variant=mips32r2
I'd like to tidy up mips_arch_variant=mips32r2. Is this working as intended?

In chromium's common.gypi, the variants are called r1 and r2. There's a cflag
-mips32r2 but no such variant. Does this have an effect at all? Or should it be
changed to  mips_arch_variant=r2?

https://codereview.chromium.org/1207693004/diff/1/Makefile.android#oldcode53
Makefile.android:53: DEFINES = target_arch=x87 v8_target_arch=x87
android_target_arch=x86 android_target_platform=16
Target arch x87 seems like a mistake to me. CC'ing somebody from intel.

[commit-bot: I haz the power, 2015-06-24 15:19:54]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-06-24 15:19:55]

Dry run: This issue passed the CQ dry run.

[dusmil.imgtec, 2015-06-24 15:55:19]

dusan.milosavljevic@imgtec.com changed reviewers:
+ dusan.milosavljevic@imgtec.com

[dusmil.imgtec, 2015-06-24 15:55:20]

https://codereview.chromium.org/1207693004/diff/1/Makefile.android
File Makefile.android (left):

https://codereview.chromium.org/1207693004/diff/1/Makefile.android#oldcode47
Makefile.android:47: DEFINES += android_target_arch=mips
mips_arch_variant=mips32r2
Yes, this should follow chromium variants and variants from standalone.gypi.
So the correct values are r1, r2, r6. Default value for standalone d8 shell
build for android should be r2.

[ulan, 2015-06-24 16:00:44]

lgtm

[dusmil.imgtec, 2015-06-24 16:08:24]

https://codereview.chromium.org/1207693004/diff/1/Makefile.android
File Makefile.android (left):

https://codereview.chromium.org/1207693004/diff/1/Makefile.android#oldcode47
Makefile.android:47: DEFINES += android_target_arch=mips
mips_arch_variant=mips32r2
On 2015/06/24 14:53:31, Michael Achenbach wrote:
I see now this is not a gyp variable and most likely it does not have any
effect.

[Michael Achenbach, 2015-06-26 08:46:59]

PTAL at patch 3.

https://codereview.chromium.org/1207693004/diff/1/Makefile.android
File Makefile.android (left):

https://codereview.chromium.org/1207693004/diff/1/Makefile.android#oldcode47
Makefile.android:47: DEFINES += android_target_arch=mips
mips_arch_variant=mips32r2
On 2015/06/24 16:08:23, dusmil.imgtec wrote:
> On 2015/06/24 14:53:31, Michael Achenbach wrote:
> I see now this is not a gyp variable and most likely it does not have any
> effect.

I'll delete mips_arch_variant as it has no effect. A further code-smell is that
in our standalon.gypi, the mips_arch_variant is set to r2 by default, but then
there is no code that reads the variable at all. In chromium's common.gypi,
several cflags are set/unset based on the variant version.

https://codereview.chromium.org/1207693004/diff/20001/Makefile.android
File Makefile.android (right):

https://codereview.chromium.org/1207693004/diff/20001/Makefile.android#newcode40
Makefile.android:40: DEFINES += arm_neon=0 arm_version=7
Moving arm_version into gypi. Deleting neon=0 as it is not read in our gypi
files. Our default configuration is for neon=0.

[Michael Achenbach, 2015-06-26 08:54:07]

The CQ bit was checked by machenbach@chromium.org

[Michael Achenbach, 2015-06-26 08:54:07]

The patchset sent to the CQ was uploaded after l-g-t-m from ulan@chromium.org
Link to the patchset: https://codereview.chromium.org/1207693004/#ps60001
(title: "Remove odd files that sneaked in")

[commit-bot: I haz the power, 2015-06-26 08:54:20]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1207693004/60001

[commit-bot: I haz the power, 2015-06-26 09:19:16]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2015-06-26 09:19:39]

Patchset 4 (id:??) landed as
https://crrev.com/174869573e42c999da1489c264b9c4602b98ba31
Cr-Commit-Position: refs/heads/master@{#29314}

[Benedikt Meurer, 2015-06-26 10:01:59]

A revert of this CL (patchset #4 id:60001) has been created in
https://codereview.chromium.org/1211383002/ by bmeurer@chromium.org.

The reason for reverting is: Breaks arm64 bots..