Use format() when creating strings from more than two parts

[builder.git] / source / androidapplicationcomponent.cpp

diff --git a/source/androidapplicationcomponent.cpp b/source/androidapplicationcomponent.cpp
index 26277c8c02450fd8c75c065cc4f1e0a3ec090e0e..95eb9447dc3fe8bd88e684d1e86a6c876ef3f9a7 100644 (file)
--- a/source/androidapplicationcomponent.cpp
+++ b/source/androidapplicationcomponent.cpp
@@ -1,4 +1,5 @@
 #include <msp/fs/utils.h>
+#include <msp/strings/format.h>
 #include "androidapplicationcomponent.h"
 #include "androidmanifestfile.h"
 #include "androidresourcefile.h"
@@ -50,7 +51,7 @@ void AndroidApplicationComponent::create_targets() const
        apk_sources.push_back(resource_bundle);
 
        const Architecture &arch = package.get_builder().get_current_arch();
-       string lib_dir = "//"+name+"/lib/";
+       string lib_dir = format("//%s/lib/", name);
        if(arch.get_type()=="arm")
        {
                lib_dir += "armeabi";
@@ -60,7 +61,7 @@ void AndroidApplicationComponent::create_targets() const
        else
                lib_dir += arch.get_type();
 
-       string assets_dir = "//"+name+"/assets";
+       string assets_dir = format("//%s/assets", name);
        for(Target *t: contents)
        {
                Target *staged = 0;