commit 015376180a829114cc3d819568883d2bab5a1d6b
author Andrew Grieve <agrieve@chromium.org> Wed Oct 12 16:05:11 2022
committer Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Oct 12 16:05:11 2022
tree e29f4ad1083d104e55400de33c98f7ea70b1f1e9
parent 91846fcc74d3919a7b6cda4f751171c17cf6cb57

Revert "Android: Always use generated _jni.h files from default toolchain"

This reverts commit a7f7230befa072e62486de49994c9af331de2a34.

Reason for revert: arm64 compile failures crbug.com/1373705

Original change's description:
> Android: Always use generated _jni.h files from default toolchain
>
> Two motivations:
> 1) For target_cpu="arm64", it's wasteful to regenerate these files when
>    building the arm32 libraries for fat apks.
> 2) I'm working on introducing a new toolchain for robolectric tests to
>    use native code, and getting jni generation to work in this toolchain
>    (which has is_android=false) is tricky. It's simpler to re-use the
>    code gen from the default toolchain.
>
> Rather than suffix every dep of a generate_jni target with
> "($default_toolchain)", this changes the generate_jni() template to
> trampoline to the default_toolchain's copy.
>
> Bug: 1369398, 1223993
> Change-Id: I845ed60fa53d617d2b2ab5566b6468cce4271923
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3925477
> Reviewed-by: Dirk Pranke <dpranke@google.com>
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Reviewed-by: Samuel Huang <huangs@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1057481}

Bug: 1369398, 1223993, 1373705
Change-Id: I36e5045446442c35c62c1e2944a473ab496a8930
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3949850
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#1058080}