[tor-commits] [tor-browser-build/master] Bug 40070: Use android-* targets instead of torbrowser-android-* targets

[gk at torproject.org]

commit d77303e7979ae94006837a38db646966d8b01ae3
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Sep 10 20:08:54 2020 +0200

    Bug 40070: Use android-* targets instead of torbrowser-android-* targets
---
 projects/application-services/config    | 24 ++++++++++++------------
 projects/tor-android-service/config     |  8 ++++----
 projects/tor-onion-proxy-library/config | 16 ++++++++--------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/projects/application-services/config b/projects/application-services/config
index 1d9fd79..0560872 100644
--- a/projects/application-services/config
+++ b/projects/application-services/config
@@ -26,51 +26,51 @@ input_files:
   - project: fenix-rust
     name: rust-armv7
     target_prepend:
-      - torbrowser-android-armv7
+      - android-armv7
   - project: fenix-rust
     name: rust-aarch64
     target_prepend:
-      - torbrowser-android-aarch64
+      - android-aarch64
   - project: fenix-rust
     name: rust-x86
     target_prepend:
-      - torbrowser-android-x86
+      - android-x86
   - project: fenix-rust
     name: rust-x86_64
     target_prepend:
-      - torbrowser-android-x86_64
+      - android-x86_64
   - project: nss
     name: nss-armv7
     target_prepend:
-      - torbrowser-android-armv7
+      - android-armv7
   - project: nss
     name: nss-aarch64
     target_prepend:
-      - torbrowser-android-aarch64
+      - android-aarch64
   - project: nss
     name: nss-x86
     target_prepend:
-      - torbrowser-android-x86
+      - android-x86
   - project: nss
     name: nss-x86_64
     target_prepend:
-      - torbrowser-android-x86_64
+      - android-x86_64
   - project: sqlcipher
     name: sqlcipher-armv7
     target_prepend:
-      - torbrowser-android-armv7
+      - android-armv7
   - project: sqlcipher
     name: sqlcipher-aarch64
     target_prepend:
-      - torbrowser-android-aarch64
+      - android-aarch64
   - project: sqlcipher
     name: sqlcipher-x86
     target_prepend:
-      - torbrowser-android-x86
+      - android-x86
   - project: sqlcipher
     name: sqlcipher-x86_64
     target_prepend:
-      - torbrowser-android-x86_64
+      - android-x86_64
   - name: python
     project: python
     enable: '[% !c("var/fetch_gradle_dependencies") %]'
diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config
index e2bb2db..586bbca 100644
--- a/projects/tor-android-service/config
+++ b/projects/tor-android-service/config
@@ -25,16 +25,16 @@ input_files:
   - project: tor
     name: tor-armv7
     target_prepend:
-      - torbrowser-android-armv7
+      - android-armv7
   - project: tor
     name: tor-aarch64
     target_prepend:
-      - torbrowser-android-aarch64
+      - android-aarch64
   - project: tor
     name: tor-x86
     target_prepend:
-      - torbrowser-android-x86
+      - android-x86
   - project: tor
     name: tor-x86_64
     target_prepend:
-      - torbrowser-android-x86_64
+      - android-x86_64
diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config
index 671e988..2faa752 100644
--- a/projects/tor-onion-proxy-library/config
+++ b/projects/tor-onion-proxy-library/config
@@ -22,35 +22,35 @@ input_files:
   - project: obfs4
     name: obfs4-armv7
     target_prepend:
-      - torbrowser-android-armv7
+      - android-armv7
   - project: obfs4
     name: obfs4-aarch64
     target_prepend:
-      - torbrowser-android-aarch64
+      - android-aarch64
   - project: obfs4
     name: obfs4-x86
     target_prepend:
-      - torbrowser-android-x86
+      - android-x86
   - project: obfs4
     name: obfs4-x86_64
     target_prepend:
-      - torbrowser-android-x86_64
+      - android-x86_64
   - project: snowflake
     name: snowflake-armv7
     target_prepend:
-      - torbrowser-android-armv7
+      - android-armv7
   - project: snowflake
     name: snowflake-aarch64
     target_prepend:
-      - torbrowser-android-aarch64
+      - android-aarch64
   - project: snowflake
     name: snowflake-x86
     target_prepend:
-      - torbrowser-android-x86
+      - android-x86
   - project: snowflake
     name: snowflake-x86_64
     target_prepend:
-      - torbrowser-android-x86_64
+      - android-x86_64
   - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'
     name: gradle-dependencies
     exec: '[% INCLUDE "fetch-gradle-dependencies" %]'