github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-17 14:16:10 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Android builder from now can handle native activity

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8675 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
klugier 2015-07-12 09:25:44 +00:00
parent 5bdae46e3a
commit 0b555e3377
8 changed files with 74 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

31
uppsrc/ide/Builders/AndroidModuleMakeFile.cpp
View file

@ -39,6 +39,7 @@ String AndroidModuleMakeFile::ToString() const
AppendStaticLibraries(makeFile);
AppendSharedLibraries(makeFile);
makeFile << "include $(BUILD_SHARED_LIBRARY)\n";
AppendModules(makeFile);
return makeFile;
}
@ -63,6 +64,11 @@ void AndroidModuleMakeFile::AddStaticLibrary(const String& staticLibrary)
staticLibraries.Add(staticLibrary);
}
void AndroidModuleMakeFile::AddStaticModuleLibrary(const String& staticModuleLibrary)
{
staticModuleLibraries.Add(staticModuleLibrary);
}
void AndroidModuleMakeFile::AddSharedLibrary(const String& sharedLibrary)
{
sharedLibraries.Add(sharedLibrary);
@ -101,7 +107,11 @@ void AndroidModuleMakeFile::AppendLdLibraries(String& makeFile) const
void AndroidModuleMakeFile::AppendStaticLibraries(String& makeFile) const
{
AndroidMakeFile::AppendStringVector(makeFile, staticLibraries, "LOCAL_STATIC_LIBRARIES");
Vector<String> allLibs;
allLibs.Append(staticLibraries);
allLibs.Append(staticModuleLibraries);
AndroidMakeFile::AppendStringVector(makeFile, allLibs, "LOCAL_STATIC_LIBRARIES");
}
void AndroidModuleMakeFile::AppendSharedLibraries(String& makeFile) const
@ -109,4 +119,23 @@ void AndroidModuleMakeFile::AppendSharedLibraries(String& makeFile) const
AndroidMakeFile::AppendStringVector(makeFile, sharedLibraries, "LOCAL_SHARED_LIBRARIES");
}
void AndroidModuleMakeFile::AppendModules(String& makeFile) const
{
if(staticModuleLibraries.GetCount()) {
for(int i = 0; i < staticModuleLibraries.GetCount(); i++) {
if(i == 0)
makeFile << "\n";
const String androidPrefix = "android_";
String module = staticModuleLibraries[i];
if(module.StartsWith(androidPrefix))
module.Remove(0, androidPrefix.GetCount());
module = "android/" + module;
makeFile << "$(call import-module, " << module << ")\n";
}
}
}
END_UPP_NAMESPACE