---

yaml
---
r: 41955
b: refs/heads/master
c: 718a0fc
h: refs/heads/master
i:
  41953: 0965851
  41951: 7f7d825
v: v3

Author: ILyoan

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 07d0af151a5c2acf283b960eb34d769b0fb06c29
+refs/heads/master: 718a0fcdc1d6a338cddc9aba76a2ae1ddb4e9486
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/librustc/middle/resolve.rs

@@ -10,6 +10,7 @@
 
 use core::prelude::*;
 
+use driver::session;
 use driver::session::Session;
 use metadata::csearch::{each_path, get_method_names_if_trait};
 use metadata::csearch::{get_static_methods_if_impl, get_type_name_if_impl};
@@ -3931,7 +3932,10 @@ impl Resolver {
             item_fn(ref fn_decl, _, ref ty_params, ref block) => {
                 // If this is the main function, we must record it in the
                 // session.
-                if !self.session.building_library {
+                // FIXME #4404 android JNI hacks
+                if !self.session.building_library ||
+                    self.session.targ_cfg.os == session::os_android {
+
                     if self.attr_main_fn.is_none() &&
                            item.ident == special_idents::main {