diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h index 96725dec72..d1ec28a79a 100644 --- a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h +++ b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h @@ -620,36 +620,13 @@ private: const char* basicJucePaths[] = { "${project.rootDir}/app", "${ext.juceRootDir}", "${ext.juceModuleDir}", nullptr }; StringArray includePaths (basicJucePaths); - auto cppFiles = getAllIncludedCppFiles(); - - for (const auto& cppFile : cppFiles) - includePaths.addIfNotAlreadyThere (getIncludePathForFile (cppFile)); + includePaths.add (sanitisePath (project.getProjectFolder().getFullPathName() + "/Source/")); + includePaths.add (sanitisePath (project.getProjectFolder().getFullPathName() + "/../../JUCE/modules/")); for (const auto& path : includePaths) ndk->add (path); } - Array getAllIncludedCppFiles() const - { - Array cppFiles; - const auto& groups = getAllGroups(); - - for (int i = 0; i < groups.size(); ++i) - findAllProjectItemsWithPredicate (groups.getReference (i), cppFiles, ShouldBeAddedToProjectPredicate()); - - return cppFiles; - } - - String getIncludePathForFile (const RelativePath& file) const - { - return sanitisePath (project.getProjectFolder().getFullPathName() + "/" - + file.rebased (getTargetFolder(), - project.getProjectFolder(), - RelativePath::projectFolder) - .toUnixStyle() - .upToLastOccurrenceOf ("/", false, false)); - } - void addNdkLinkerFlags (GradleObject* ndk) const { const auto linkerFlags = StringArray::fromTokens (getExtraLinkerFlagsString(), " ", "");