---

yaml
---
r: 42630
b: refs/heads/try
c: 25f9fa0
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
-refs/heads/try: ce954d117fd1e8b0ab320ed905726b658ccb7db0
+refs/heads/try: 25f9fa0359e35e6e55b841049598a6aff87fd668
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/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 {