From 718a0fcdc1d6a338cddc9aba76a2ae1ddb4e9486 Mon Sep 17 00:00:00 2001 From: ILyoan Date: Thu, 24 Jan 2013 13:13:52 +0900 Subject: [PATCH] export entry point for android --- src/librustc/middle/resolve.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/librustc/middle/resolve.rs b/src/librustc/middle/resolve.rs index c023a24ecea..d0496798d1b 100644 --- a/src/librustc/middle/resolve.rs +++ b/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 {