user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4608 from ILyoan/entry_android

Browse source 
export entry point for android
This commit is contained in:
Tim Chevalier 2013-01-24 11:16:05 -08:00
commit 25f9fa0359
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/librustc/middle/resolve.rs
View file

@ -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 {