Disable depending on ring for x86, armv7 targets

[zonyitoo]

shadowsocks/shadowsocks-android#2622
shadowsocks/crypto2#6

1. Set RUSTFLAGS separately for x86

shadowsocks-rust/.cargo/config.toml

Lines 6 to 11 in d0fc263

	[target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))']
	rustflags = [
	# "--print", "native-static-libs",
	# "-C", "target-cpu=native",
	"-C", "target-feature=+aes,+pclmul,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+avx,+avx2,+fma,adx",
	]

2. Disable ring for x86 and armv7 compile target

shadowsocks-rust/shadowsocks/Cargo.toml

Lines 90 to 94 in d0fc263

	[target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies]
	shadowsocks-crypto = { version = "0.1", features = ["ring"] }
	[target.'cfg(any(target_arch = "arm", target_arch = "aarch64"))'.dependencies]
	shadowsocks-crypto = { version = "0.1", features = ["ring"] }

@madeye Please verify if these modification works for your x86 Android device.

[madeye]

Yes, with the following change, shadowsocks-rust works now on x86 android simulator.

--- a/.cargo/config.toml
+++ b/.cargo/config.toml

@@ -3,7 +3,14 @@ rustflags = [
     # "--print", "native-static-libs",
 ]

-[target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))']
+[target.'cfg(any(target_arch = "x86"))']
+rustflags = [
+    # "--print", "native-static-libs",
+    # "-C", "target-cpu=native",
+    "-C", "target-feature=+aes,+pclmul,+sse,+sse2,+sse3,+ssse3",
+]
+
+[target.'cfg(any(target_arch = "x86_64"))']
 rustflags = [
     # "--print", "native-static-libs",
     # "-C", "target-cpu=native",

--- a/shadowsocks/Cargo.toml
+++ b/shadowsocks/Cargo.toml

@@ -87,10 +87,16 @@ tower = { git = "https://github.com/tower-rs/tower.git", optional = true }
 ipnet = "2.3"
 iprange = "0.6"

-[target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies]
+[target.'cfg(any(target_arch = "arm"))'.dependencies]
+shadowsocks-crypto = { version = "0.1" }
+
+[target.'cfg(any(target_arch = "x86"))'.dependencies]
+shadowsocks-crypto = { version = "0.1" }
+
+[target.'cfg(any(target_arch = "x86_64"))'.dependencies]
 shadowsocks-crypto = { version = "0.1", features = ["ring"] }

-[target.'cfg(any(target_arch = "arm", target_arch = "aarch64"))'.dependencies]
+[target.'cfg(any(target_arch = "aarch64"))'.dependencies]
 shadowsocks-crypto = { version = "0.1", features = ["ring"] }

 [target.'cfg(not(any(target_arch = "x86", target_arch = "x86_64", target_arch = "arm", target_arch = "aarch64")))'.dependencies]

[zonyitoo]

Great. These changes will be included in v1.9.0 release.