X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fandroidtools.cpp;h=15126734de660f128b006573713eaf21f71a4874;hb=d774d554c4c15b963215212b26a9ee5df3d705e8;hp=13ebc2530556413b97afd0fc57ab31ccc35eacd8;hpb=43a748b89ce120b9f837f8a49c613680011653b3;p=builder.git diff --git a/source/androidtools.cpp b/source/androidtools.cpp index 13ebc25..1512673 100644 --- a/source/androidtools.cpp +++ b/source/androidtools.cpp @@ -1,78 +1,178 @@ #include #include +#include +#include #include #include -#include "androidccompiler.h" -#include "androidcxxcompiler.h" +#include "androidarchiver.h" +#include "androidassetpackagingtool.h" +#include "androidcompiler.h" #include "androidlinker.h" +#include "androidmanifestgenerator.h" #include "androidtools.h" +#include "apkbuilder.h" #include "architecture.h" #include "builder.h" +#include "jarsigner.h" using namespace std; using namespace Msp; -AndroidTools::AndroidTools(Builder &builder, const Architecture &arch): - ndk(builder, arch) +// TODO Mark problems somewhere instead of throwing exceptions + +unsigned parse_version(const std::string &version_str) { - add_tool(new AndroidCCompiler(builder, arch, ndk)); - add_tool(new AndroidCxxCompiler(builder, arch, ndk)); - add_tool(new AndroidLinker(builder, arch, ndk)); + vector version_parts = split(version_str, '.'); + unsigned version = lexical_cast(version_parts[0])<<16; + if(version_parts.size()>1) + version += lexical_cast(version_parts[1])<<8; + if(version_parts.size()>2) + version += lexical_cast(version_parts[2]); + return version; +} + + +AndroidDevKit::AndroidDevKit(Builder &b, const string &type): + builder(b) +{ + string var = format("ANDROID_%s_ROOT", type); + if(const char *value = getenv(var.c_str())) + root = value; + 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]*$"); + + for(list::const_iterator i=platforms.begin(); i!=platforms.end(); ++i) + supported_api_levels.insert(lexical_cast(i->substr(8))); +} + +void AndroidDevKit::select_api_level(unsigned api) +{ + if(!supported_api_levels.count(api)) + throw invalid_argument("AndroidDevKit::select_api_level"); + + init_api_level(api); +} + + +AndroidSdk::AndroidSdk(Builder &b): + AndroidDevKit(b, "SDK") +{ + find_build_tools_dir(); +} + +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); + + string use_tools; + unsigned latest_version = 0; + for(list::const_iterator i=tool_versions.begin(); i!=tool_versions.end(); ++i) + { + unsigned version = parse_version(*i); + if(version>latest_version) + { + use_tools = *i; + latest_version = version; + } + } + + if(use_tools.empty()) + { + 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 found in %s", build_tools_dir.str())); +} + +void AndroidSdk::init_api_level(unsigned api) +{ + platform_jar = root/"platforms"/format("android-%d", api)/"android.jar"; } AndroidNdk::AndroidNdk(Builder &b, const Architecture &a): - builder(b), + AndroidDevKit(b, "NDK"), architecture(a) { - if(const char *env_ndk_root = getenv("ANDROID_NDK_ROOT")) - ndk_root = env_ndk_root; - else - throw runtime_error("ANDROID_NDK_ROOT must be set"); + 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(); - find_platform_dir(); } void AndroidNdk::find_toolchain_dir() { - FS::Path toolchains_dir = ndk_root/"toolchains"; - builder.get_logger().log("files", format("Traversing %s", toolchains_dir.str())); - list toolchains = list_files(toolchains_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) - if(!i->compare(0, prefix.size(), prefix)) + { + string version_str = i->substr(prefix.size()); + string compiler = "gcc"; + if(!isdigit(version_str[0])) + { + unsigned j; + for(j=1; (jlatest_version) { - string version_str = i->substr(prefix.size()); - string compiler = "gcc"; - if(!isdigit(version_str[0])) - { - unsigned j; - for(j=1; (j version_parts = split(version_str, '.'); - unsigned version = (lexical_cast(version_parts[0])<<8); - if(version_parts.size()>1) - version += lexical_cast(version_parts[1]); - - if(version>latest_version) - { - use_toolchain = *i; - latest_version = version; - } + use_toolchain = *i; + 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(); @@ -81,35 +181,18 @@ 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::find_platform_dir() +void AndroidNdk::init_api_level(unsigned api) { - FS::Path platforms_dir = ndk_root/"platforms"; - builder.get_logger().log("files", format("Traversing %s", platforms_dir.str())); - list platforms = list_files(platforms_dir); - - string use_platform; - unsigned highest_level = 0; - for(list::const_iterator i=platforms.begin(); i!=platforms.end(); ++i) - if(!i->compare(0, 8, "android-")) - { - unsigned level = lexical_cast(i->substr(8)); - if(level>highest_level) - { - use_platform = *i; - highest_level = level; - } - } - - if(use_platform.empty()) - throw runtime_error("No applicable platforms found"); - - FS::Path platform_archs_dir = platforms_dir/use_platform; + 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) @@ -117,8 +200,41 @@ void AndroidNdk::find_platform_dir() 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 platform sysroot is %s", platform_sysroot)); +} - platform_sysroot = platforms_dir/use_platform/use_arch; - builder.get_logger().log("tools", format("Android platform sysroot is %s", platform_sysroot.str())); + +AndroidTools::AndroidTools(Builder &builder, const Architecture &arch): + sdk(builder), + ndk(builder, arch) +{ + 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) + { + 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 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)); + add_tool(new JarSigner(builder)); }