commit 9dda80f41584d93b9e30fc534c6de46337fecb30 Author: Georg Koppen gk@torproject.org Date: Tue Apr 2 07:18:23 2019 +0000

Bug 29980: Add android-x86 target to README files --- README | 1 + README.HACKING | 18 ++++++++++-------- README.MAKEFILE | 12 ++++++++---- 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/README b/README index e1e93c6..2b09ab1 100644 --- a/README +++ b/README @@ -81,6 +81,7 @@ name to the makefile target: $ make nightly-windows-i686 $ make nightly-osx-x86_64 $ make nightly-android-armv7 + $ make nightly-android-x86

When you want to quickly do a build to test a change, you can use the testbuild makefile target, and find the build in the testbuild directory. diff --git a/README.HACKING b/README.HACKING index 7634093..081a3d5 100644 --- a/README.HACKING +++ b/README.HACKING @@ -45,17 +45,17 @@ The targets are usually used to select:

- the platform: torbrowser-linux-x86_64, torbrowser-linux-i686, torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64, - torbrowser-android-armv7 + torbrowser-android-armv7, torbrowser-android-x86 - the channel: release, nightly, alpha

The targets torbrowser-linux-x86_64, torbrowser-linux-i686, -torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64, and -torbrowser-android-armv7 are special cases. They do not contain options -directly, instead they contain a list of other targets. For instance, the -torbrowser-linux-x86_64 target is pointing to the linux-x86_64 and linux -targets. You should define an option under the linux target if it applies to -Linux on both architectures, or under the linux-x86_64 if it only applies to the -x86_64 architecture. +torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64, +torbrowser-android-armv7, and torbrowser-android-x86 are special cases. They do +not contain options directly, instead they contain a list of other targets. For +instance, the torbrowser-linux-x86_64 target is pointing to the linux-x86_64 and +linux targets. You should define an option under the linux target if it applies +to Linux on both architectures, or under the linux-x86_64 if it only applies to +the x86_64 architecture.

An option that is defined at the root of rbm.conf can be overridden by an other definition under a target, or inside projects/$project/config. @@ -156,6 +156,8 @@ $platform should be one of the following:

- torbrowser-android-armv7

+ - torbrowser-android-x86 + For example, to see tor's build script for linux x86_64 on the alpha channel, you can use:

diff --git a/README.MAKEFILE b/README.MAKEFILE index 7351c5f..addff64 100644 --- a/README.MAKEFILE +++ b/README.MAKEFILE @@ -7,7 +7,8 @@ release Build Tor Browser for the release channel, for all supported platforms. The resulting build can be found in directory release/$version.

-release-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7} +release-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, + android-x86} ----------------------------------------------------------------------- Same as release, for the selected platform only.

@@ -16,7 +17,8 @@ alpha Build Tor Browser for the alpha channel, for all supported platforms. The resulting build can be found in directory alpha/$version.

-alpha-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7} +alpha-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, + android-x86} --------------------------------------------------------------------- Same as alpha, for the selected platform only.

@@ -29,7 +31,8 @@ components.

The resulting build can be found in directory nightly/$date

-nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7} +nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, + android-x86} ----------------------------------------------------------------------- Same as nightly, for the selected platform only.

@@ -39,7 +42,8 @@ Build Tor Browser for the alpha channel, for all supported platforms. This is the same as 'make alpha', but the output directory is different. The resulting build can be found in directory alpha_nightly/$date

-alpha_nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7} +alpha_nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, + android-x86} ----------------------------------------------------------------------------- The same as alpha_nightly, for the selected platform only.