Skip to content

Commit

Permalink
Revert toolchain to GCC 4.9
Browse files Browse the repository at this point in the history
  • Loading branch information
madeye committed Aug 14, 2016
1 parent dd6cd39 commit 63713b1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/main/jni/Application.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
APP_ABI := armeabi-v7a x86
APP_PLATFORM := android-16
APP_STL := stlport_static
NDK_TOOLCHAIN_VERSION := clang
NDK_TOOLCHAIN_VERSION := 4.9
2 changes: 1 addition & 1 deletion src/main/scala/com/github/shadowsocks/Shadowsocks.scala
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ class Shadowsocks extends AppCompatActivity with ServiceBoundContext {
private def updatePreferenceScreen(profile: Profile) {
if (profile.host == "198.199.101.152") if (adView == null) {
adView = new AdView(this)
adView.setAdUnitId("ca-app-pub-4984938374218635/1433320509")
adView.setAdUnitId("ca-app-pub-9097031975646651/7760346322")
adView.setAdSize(AdSize.SMART_BANNER)
preferences.getView.asInstanceOf[ViewGroup].addView(adView, 1)
adView.loadAd(new AdRequest.Builder().build())
Expand Down

13 comments on commit 63713b1

@wongsyrone
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason to revert? Google will remove GCC in next release of NDK

@madeye
Copy link
Contributor Author

@madeye madeye commented on 63713b1 Aug 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Observed crashes on Android 4.2 due to clang. Let's wait for Google's next release.

@Mygod
Copy link
Contributor

@Mygod Mygod commented on 63713b1 Aug 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try ndk beta release?

@wongsyrone
Copy link
Contributor

@wongsyrone wongsyrone commented on 63713b1 Aug 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK. I didn't notice such issue since I have no devices running Android 4.x - 5.x.

@wongsyrone
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You may want to check issue list or report a new one.

https://github.com/android-ndk/ndk/issues

@madeye
Copy link
Contributor Author

@madeye madeye commented on 63713b1 Aug 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm thinking of drop the support of Android 4.x in the next release.

There are too many differences in VPNService between 4.x and 5.x+. I have to borrow a MIUI device for debugging, quite annoying.

@madeye
Copy link
Contributor Author

@madeye madeye commented on 63713b1 Aug 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Mygod
Copy link
Contributor

@Mygod Mygod commented on 63713b1 Aug 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I have Python 3 as default so I'm using this beta 1 release to compile.

@Mygod
Copy link
Contributor

@Mygod Mygod commented on 63713b1 Aug 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As of August 1, 2016, Android 4.1-4.4 still has a market share of 45.9%. I expect this number to be higher in China where Google Play Store isn't available for the majority of the devices.

@madeye
Copy link
Contributor Author

@madeye madeye commented on 63713b1 Aug 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😞

@Mygod
Copy link
Contributor

@Mygod Mygod commented on 63713b1 Aug 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the other hand, let's drop support for Android 4.3 and below. Unrelated article.

Note that default minSdkVersion in sbt-android has also changed to 19 recently.

I also noticed that latest Chrome version still supports Android 4.1.

@madeye
Copy link
Contributor Author

@madeye madeye commented on 63713b1 Aug 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Mygod
Copy link
Contributor

@Mygod Mygod commented on 63713b1 Aug 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

*Sorry I meant to say default minSdkVersion instead of minSdkVersion. See changelog for 1.6.9.

Please sign in to comment.