X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fandroidtools.cpp;h=1633b8b6465dd575acd0676536969a7b9d027af1;hb=82c7d6187fdaeaa1b9cfbd6637d9b047a78f17ec;hp=809da7dc9e3f45830cc3a18a233812a76961aa6e;hpb=a4f02f02d4682c7f504e46ff2ce8f93035fd36dd;p=builder.git diff --git a/source/androidtools.cpp b/source/androidtools.cpp index 809da7d..1633b8b 100644 --- a/source/androidtools.cpp +++ b/source/androidtools.cpp @@ -1,5 +1,7 @@ -#include +#include +#include #include +#include #include #include #include @@ -31,26 +33,41 @@ unsigned parse_version(const std::string &version_str) } -AndroidDevKit::AndroidDevKit(Builder &b, const string &type): +AndroidDevKit::AndroidDevKit(Builder &b, const string &type, const FS::Path &default_path): builder(b) { string var = format("ANDROID_%s_ROOT", type); - if(const char *value = getenv(var.c_str())) - root = value; - else - throw runtime_error(var+" must be set"); + root = getenv(var); + if(root.empty()) + { + if(!default_path.empty() && FS::exists(default_path)) + root = default_path; + else + { + builder.get_logger().log("problems", format("Android %s not found", type)); + return; + } + } FS::Path platforms_dir = root/"platforms"; - builder.get_logger().log("files", format("Traversing %s", platforms_dir.str())); - list platforms = list_filtered(platforms_dir, "^android-[1-9][0-9]*$"); + if(!FS::exists(platforms_dir)) + return; - for(list::const_iterator i=platforms.begin(); i!=platforms.end(); ++i) - supported_api_levels.insert(lexical_cast(i->substr(8))); + builder.get_logger().log("files", format("Traversing %s", platforms_dir.str())); + supported_api_levels = 0; + for(const string &p: list_filtered(platforms_dir, "^android-[1-9][0-9]*$")) + { + unsigned api = lexical_cast(p.substr(8)); + if(api>63) + builder.get_logger().log("problems", format("API level %d is too high", api)); + else + supported_api_levels |= 1< tool_versions = list_files(bt_dir); + if(!FS::exists(bt_dir)) + { + builder.get_logger().log("problems", "Android build-tools not found"); + return; + } + builder.get_logger().log("files", format("Traversing %s", bt_dir.str())); string use_tools; unsigned latest_version = 0; - for(list::const_iterator i=tool_versions.begin(); i!=tool_versions.end(); ++i) + for(const string &v: list_files(bt_dir)) { - unsigned version = parse_version(*i); + unsigned version = parse_version(v); if(version>latest_version) { - use_tools = *i; + use_tools = v; latest_version = version; } } if(use_tools.empty()) - throw runtime_error("No build tools found"); + { + builder.get_logger().log("problems", "Android build-tools not found"); + return; + } build_tools_dir = bt_dir/use_tools; - builder.get_logger().log("tools", format("Android build tools are in %s", build_tools_dir.str())); + builder.get_logger().log("tools", format("Android build-tools found in %s", build_tools_dir.str())); } void AndroidSdk::init_api_level(unsigned api) { - if(!supported_api_levels.count(api)) - throw invalid_argument("AndroidSdk::select_api_level"); - platform_jar = root/"platforms"/format("android-%d", api)/"android.jar"; } -AndroidNdk::AndroidNdk(Builder &b, const Architecture &a): - AndroidDevKit(b, "NDK"), +AndroidNdk::AndroidNdk(Builder &b, const Architecture &a, const AndroidSdk &sdk): + AndroidDevKit(b, "NDK", create_default_path(sdk)), architecture(a) { + if(!root.empty()) + { + FS::Path csr = root/"sysroot"; + if(FS::exists(csr)) + { + common_sysroot = csr; + builder.get_logger().log("tools", format("Android NDK common sysroot is %s", common_sysroot)); + } + } + find_toolchain_dir(); } +FS::Path AndroidNdk::create_default_path(const AndroidSdk &sdk) +{ + if(sdk.get_root_dir().empty()) + return FS::Path(); + return sdk.get_root_dir()/"ndk-bundle"; +} + void AndroidNdk::find_toolchain_dir() { + if(root.empty()) + return; + FS::Path toolchains_dir = root/"toolchains"; + if(!FS::exists(toolchains_dir)) + { + builder.get_logger().log("problems", "Android NDK toolchains not found"); + return; + } + builder.get_logger().log("files", format("Traversing %s", toolchains_dir.str())); string prefix = architecture.get_cross_prefix()+"-"; - list toolchains = list_filtered(toolchains_dir, "^"+prefix); - string use_toolchain; unsigned latest_version = 0; - for(list::const_iterator i=toolchains.begin(); i!=toolchains.end(); ++i) + for(const string &t: list_filtered(toolchains_dir, "^"+prefix)) { - string version_str = i->substr(prefix.size()); + string version_str = t.substr(prefix.size()); string compiler = "gcc"; if(!isdigit(version_str[0])) { @@ -131,13 +176,16 @@ void AndroidNdk::find_toolchain_dir() unsigned version = parse_version(version_str); if(version>latest_version) { - use_toolchain = *i; + use_toolchain = t; latest_version = version; } } if(use_toolchain.empty()) - throw runtime_error("No applicable toolchains found"); + { + builder.get_logger().log("problems", "No applicable Android NDK toolchains found"); + return; + } const Architecture &native_arch = builder.get_native_arch(); @@ -146,48 +194,50 @@ void AndroidNdk::find_toolchain_dir() string use_arch = native_arch.best_match(list_files(tc_archs_dir)); if(use_arch.empty()) - throw runtime_error("No matching toolchain found"); + { + builder.get_logger().log("problems", "No applicable Android NDK toolchains found"); + return; + } bin_dir = toolchains_dir/use_toolchain/"prebuilt"/use_arch/"bin"; - builder.get_logger().log("tools", format("Android toolchain binaries are in %s", bin_dir.str())); + builder.get_logger().log("tools", format("Android NDK toolchain binaries found in %s", bin_dir.str())); } void AndroidNdk::init_api_level(unsigned api) { - if(!supported_api_levels.count(api)) - throw invalid_argument("AndroidSdk::select_api_level"); - FS::Path platform_archs_dir = root/"platforms"/format("android-%d", api); builder.get_logger().log("files", format("Traversing %s", platform_archs_dir.str())); - list platform_archs = list_filtered(platform_archs_dir, "^arch-"); - for(list::iterator i=platform_archs.begin(); i!=platform_archs.end(); ++i) - i->erase(0, 5); + vector platform_archs = list_filtered(platform_archs_dir, "^arch-"); + for(string &a: platform_archs) + a.erase(0, 5); string use_arch = architecture.best_match(platform_archs); if(use_arch.empty()) - throw runtime_error("No matching platform found"); + { + builder.get_logger().log("problems", "No matching Android NDK platform found"); + return; + } platform_sysroot = platform_archs_dir/("arch-"+use_arch); - builder.get_logger().log("tools", format("Android NDK sysroot is %s", platform_sysroot.str())); + builder.get_logger().log("tools", format("Android NDK platform sysroot is %s", platform_sysroot)); } AndroidTools::AndroidTools(Builder &builder, const Architecture &arch): sdk(builder), - ndk(builder, arch) + ndk(builder, arch, sdk) { - const set &sdk_api_levels = sdk.get_supported_api_levels(); - const set &ndk_api_levels = ndk.get_supported_api_levels(); - unsigned highest_common = 0; - for(set::const_reverse_iterator i=sdk_api_levels.rbegin(); (!highest_common && i!=sdk_api_levels.rend()); ++i) - if(ndk_api_levels.count(*i)) - highest_common = *i; - - if(!highest_common) - throw runtime_error("No usable Android platforms found"); - - sdk.select_api_level(highest_common); - ndk.select_api_level(highest_common); + if(uint64_t common_api_levels = sdk.get_supported_api_levels()&ndk.get_supported_api_levels()) + { + unsigned api = 0; + for(unsigned i=32; i>0; i>>=1) + api += i*!!(common_api_levels>>(api+i)); + builder.get_logger().log("tools", format("Using Android API level %d", api)); + sdk.select_api_level(api); + ndk.select_api_level(api); + } + else + builder.get_logger().log("problems", "No usable Android platforms found"); add_tool(new AndroidCompiler(builder, arch, "CC", ndk)); add_tool(new AndroidCompiler(builder, arch, "CXX", ndk));