Skip to content

Commit

Permalink
export entry point for android
Browse files Browse the repository at this point in the history
  • Loading branch information
ILyoan committed Jan 24, 2013
1 parent 07d0af1 commit 718a0fc
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/librustc/middle/resolve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down Expand Up @@ -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 {

Expand Down

0 comments on commit 718a0fc

Please sign in to comment.