Skip to content

Fix the logic to generate .pro file #664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 15, 2021
Merged

Fix the logic to generate .pro file #664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
38f6fe8
Fix the logic to generate .pro file
Sep 15, 2021
3697224
update readme file
Sep 15, 2021
cb64a84
Merge https://github.com/firebase/firebase-cpp-sdk into feature/rc_re…
Sep 15, 2021
e80ea39
modify the release notes
Sep 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions android_build_files/generate_proguard.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ def generateCppProguard(File library, String outCppPro) {
// proguardSet: The set of proguard files to use.
// outputProguard: The path to the output proguard file.
def generateFinalProguard(Set<File> proguardSet, String outputProguard) {

Set<String> proguardLineSet = new HashSet<String>()
for (File pro : proguardSet) {
for (String line : pro.text.split("[\\r\\n]+")) {
Expand Down Expand Up @@ -79,9 +80,12 @@ def defineGenerateProguardFile(String subproject, String buildType,
Set<File> librarySet = fileTree("$nativeBuildDir")
.matching({ include "**/*firebase_${subproject}*" }).getFiles()
String cppProguard = "$buildDir/cpp_${subproject}.pro"
if (!librarySet.isEmpty()) {
while (!librarySet.isEmpty()) {
File lib = librarySet.iterator().next()
generateCppProguard(lib, cppProguard)
librarySet.remove(lib)
if (lib.name.endsWith(".a")) {
generateCppProguard(lib, cppProguard)
}
}

// Combine the proguard files into a single file.
Expand Down
2 changes: 2 additions & 0 deletions release_build_files/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,8 @@ code.
### 8.5.0
- Changes
- General: Updating Android and iOS dependencies to the latest.
- General: Fix the generating of proguard file
([#664](https://github.com/firebase/firebase-cpp-sdk/pull/664)).

### 8.4.0
- Changes
Expand Down