diff options
| author |  ajmichael <ajmichael@google.com> | 2018-04-02 09:26:42 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-04-02 09:27:48 -0700 |
| commit | cb16c5089953127690c8971d32dc3d4cf01b7620 (patch) | |
| tree | 9769c8f778ef4eed4f3e241f60d4c929b985dcd0 /tools/cpp | |
| parent | 1592238818ce4235e689f7a77dd4fefc1a7dfc8a (diff) | |
Create proguard.txt in android_library AAR output.
The proguard.txt is the concatenation of the proguard_specs on the android_library rule itself. Note that it does not include transitively defined proguard_specs.
Fixes https://github.com/bazelbuild/bazel/issues/4467
RELNOTES: android_library AAR output now contains proguard.txt
PiperOrigin-RevId: 191302610
Diffstat (limited to 'tools/cpp')
| -rw-r--r-- | tools/cpp/CROSSTOOL.tpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/cpp/CROSSTOOL.tpl b/tools/cpp/CROSSTOOL.tpl index 3bea6aff22..518bc4453c 100644 --- a/tools/cpp/CROSSTOOL.tpl +++ b/tools/cpp/CROSSTOOL.tpl @@ -22,7 +22,7 @@ default_toolchain { } default_toolchain { - cpu: "local" + cpu: "armeabi-v7a" toolchain_identifier: "stub_armeabi-v7a" } @@ -47,7 +47,7 @@ default_toolchain { } default_toolchain { - cpu: "local" + cpu: "ios_x86_64" toolchain_identifier: "ios_x86_64" } |