X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fandroidtools.cpp;h=118926e1aa3e29dd277d77f138090c65305536b2;hb=2193df46d4e7721dbb99ce744fbc884c2447e1f9;hp=122dc23392f43017643be5c632454aaf14f45284;hpb=68f084e4ed817da0c25cefa1772cadf97b8cfe5e;p=builder.git diff --git a/source/androidtools.cpp b/source/androidtools.cpp index 122dc23..118926e 100644 --- a/source/androidtools.cpp +++ b/source/androidtools.cpp @@ -1,11 +1,12 @@ -#include +#include #include +#include #include #include #include +#include "androidarchiver.h" #include "androidassetpackagingtool.h" -#include "androidccompiler.h" -#include "androidcxxcompiler.h" +#include "androidcompiler.h" #include "androidlinker.h" #include "androidmanifestgenerator.h" #include "androidtools.h" @@ -31,20 +32,30 @@ 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"; + if(!FS::exists(platforms_dir)) + return; + builder.get_logger().log("files", format("Traversing %s", platforms_dir.str())); - list platforms = list_filtered(platforms_dir, "^android-[1-9][0-9]*$"); + vector platforms = list_filtered(platforms_dir, "^android-[1-9][0-9]*$"); - for(list::const_iterator i=platforms.begin(); i!=platforms.end(); ++i) + for(vector::const_iterator i=platforms.begin(); i!=platforms.end(); ++i) supported_api_levels.insert(lexical_cast(i->substr(8))); } @@ -66,12 +77,18 @@ AndroidSdk::AndroidSdk(Builder &b): void AndroidSdk::find_build_tools_dir() { FS::Path bt_dir = root/"build-tools"; + 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())); - list tool_versions = list_files(bt_dir); + vector tool_versions = list_files(bt_dir); string use_tools; unsigned latest_version = 0; - for(list::const_iterator i=tool_versions.begin(); i!=tool_versions.end(); ++i) + for(vector::const_iterator i=tool_versions.begin(); i!=tool_versions.end(); ++i) { unsigned version = parse_version(*i); if(version>latest_version) @@ -82,38 +99,64 @@ void AndroidSdk::find_build_tools_dir() } 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); + vector 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(vector::const_iterator i=toolchains.begin(); i!=toolchains.end(); ++i) { string version_str = i->substr(prefix.size()); string compiler = "gcc"; @@ -137,7 +180,10 @@ void AndroidNdk::find_toolchain_dir() } 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,35 +192,38 @@ 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) + vector platform_archs = list_filtered(platform_archs_dir, "^arch-"); + for(vector::iterator i=platform_archs.begin(); i!=platform_archs.end(); ++i) i->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(); @@ -183,15 +232,18 @@ AndroidTools::AndroidTools(Builder &builder, const Architecture &arch): 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(highest_common) + { + sdk.select_api_level(highest_common); + ndk.select_api_level(highest_common); + } + else + builder.get_logger().log("problems", "No usable Android platforms found"); - add_tool(new AndroidCCompiler(builder, arch, ndk)); - add_tool(new AndroidCxxCompiler(builder, arch, ndk)); + add_tool(new AndroidCompiler(builder, arch, "CC", ndk)); + add_tool(new AndroidCompiler(builder, arch, "CXX", ndk)); add_tool(new AndroidLinker(builder, arch, ndk)); + add_tool(new AndroidArchiver(builder, arch, ndk)); add_tool(new AndroidManifestGenerator(builder)); add_tool(new AndroidAssetPackagingTool(builder, sdk)); add_tool(new ApkBuilder(builder));