Skip to content

Commit 3c08742

Browse files
vimanyuvimanyu
committed
creating a uniquely named dexed jar for each resource
1 parent 34f1ad1 commit 3c08742

File tree

7 files changed

+17
-17
lines changed

7 files changed

+17
-17
lines changed

‎admob/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ set(common_SRCS
2828

2929
# Define the resource build needed for Android
3030
firebase_cpp_gradle(":admob:admob_resources:generateDexJarRelease"
31-
"${CMAKE_CURRENT_LIST_DIR}/admob_resources/build/dexed.jar")
31+
"${CMAKE_CURRENT_LIST_DIR}/admob_resources/build/admob_resourcs_lib.jar")
3232
binary_to_array("admob_resources"
33-
"${CMAKE_CURRENT_LIST_DIR}/admob_resources/build/dexed.jar"
33+
"${CMAKE_CURRENT_LIST_DIR}/admob_resources/build/admob_resources_lib.jar"
3434
"firebase_admob"
3535
"${FIREBASE_GEN_FILE_DIR}/admob")
3636

‎android_build_files/extract_and_dex.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def defineExtractionTasks(String resourceName, String buildType) {
4343
include "classes.jar"
4444
}
4545

46-
String dexedJar = "$buildDir/dexed.jar"
46+
String dexedJar = "$buildDir/${resourceName}_lib.jar"
4747
String outPro = "$buildDir/${resourceName}.pro"
4848
Task dexJar = tasks.create(
4949
name: "generateDexJar$buildType",

‎app/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@ binary_to_array("google_services_resource"
2222

2323
# Define the resource builds needed for Android
2424
firebase_cpp_gradle(":app:app_resources:generateDexJarRelease"
25-
"${CMAKE_CURRENT_LIST_DIR}/app_resources/build/dexed.jar")
25+
"${CMAKE_CURRENT_LIST_DIR}/app_resources/build/app_resources_lib.jar")
2626
binary_to_array("app_resources"
27-
"${CMAKE_CURRENT_LIST_DIR}/app_resources/build/dexed.jar"
27+
"${CMAKE_CURRENT_LIST_DIR}/app_resources/build/app_resources_lib.jar"
2828
"firebase_app"
2929
"${FIREBASE_GEN_FILE_DIR}/app")
3030
firebase_cpp_gradle(":app:google_api_resources:generateDexJarRelease"
31-
"${CMAKE_CURRENT_LIST_DIR}/google_api_resources/build/dexed.jar")
31+
"${CMAKE_CURRENT_LIST_DIR}/google_api_resources/build/google_api_resources_lib.jar")
3232
binary_to_array("google_api_resources"
33-
"${CMAKE_CURRENT_LIST_DIR}/google_api_resources/build/dexed.jar"
33+
"${CMAKE_CURRENT_LIST_DIR}/google_api_resources/build/google_api_resources_lib.jar"
3434
"google_api"
3535
"${FIREBASE_GEN_FILE_DIR}/app")
3636
firebase_cpp_gradle(":app:invites_resources:generateDexJarRelease"
37-
"${CMAKE_CURRENT_LIST_DIR}/invites_resources/build/dexed.jar")
37+
"${CMAKE_CURRENT_LIST_DIR}/invites_resources/build/invites_resources_lib.jar")
3838
binary_to_array("invites_resources"
39-
"${CMAKE_CURRENT_LIST_DIR}/invites_resources/build/dexed.jar"
39+
"${CMAKE_CURRENT_LIST_DIR}/invites_resources/build/invites_resources_lib.jar"
4040
"firebase_invites"
4141
"${FIREBASE_GEN_FILE_DIR}/app")
4242

‎auth/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ set(common_SRCS
5858

5959
# Define the resource build needed for Android
6060
firebase_cpp_gradle(":auth:auth_resources:generateDexJarRelease"
61-
"${CMAKE_CURRENT_LIST_DIR}/auth_resources/build/dexed.jar")
61+
"${CMAKE_CURRENT_LIST_DIR}/auth_resources/build/auth_resources_lib.jar")
6262
binary_to_array("auth_resources"
63-
"${CMAKE_CURRENT_LIST_DIR}/auth_resources/build/dexed.jar"
63+
"${CMAKE_CURRENT_LIST_DIR}/auth_resources/build/auth_resources_lib.jar"
6464
"firebase_auth"
6565
"${FIREBASE_GEN_FILE_DIR}/auth")
6666

‎database/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ set(common_SRCS
2727

2828
# Define the resource build needed for Android
2929
firebase_cpp_gradle(":database:database_resources:generateDexJarRelease"
30-
"${CMAKE_CURRENT_LIST_DIR}/database_resources/build/dexed.jar")
30+
"${CMAKE_CURRENT_LIST_DIR}/database_resources/build/database_resources_lib.jar")
3131
binary_to_array("database_resources"
32-
"${CMAKE_CURRENT_LIST_DIR}/database_resources/build/dexed.jar"
32+
"${CMAKE_CURRENT_LIST_DIR}/database_resources/build/database_resources_lib.jar"
3333
"firebase_database_resources"
3434
"${FIREBASE_GEN_FILE_DIR}/database")
3535

‎firestore/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ set(common_SRCS
5353

5454
# Define the resource build needed for Android
5555
firebase_cpp_gradle(":firestore:firestore_resources:generateDexJarRelease"
56-
"${CMAKE_CURRENT_LIST_DIR}/firestore_resources/build/dexed.jar")
56+
"${CMAKE_CURRENT_LIST_DIR}/firestore_resources/build/firestore_resources_lib.jar")
5757
binary_to_array("firestore_resources"
58-
"${CMAKE_CURRENT_LIST_DIR}/firestore_resources/build/dexed.jar"
58+
"${CMAKE_CURRENT_LIST_DIR}/firestore_resources/build/firestore_resources_lib.jar"
5959
"firebase_firestore"
6060
"${FIREBASE_GEN_FILE_DIR}/firestore")
6161

‎storage/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ set(common_SRCS
2626

2727
# Define the resource build needed for Android
2828
firebase_cpp_gradle(":storage:storage_resources:generateDexJarRelease"
29-
"${CMAKE_CURRENT_LIST_DIR}/storage_resources/build/dexed.jar")
29+
"${CMAKE_CURRENT_LIST_DIR}/storage_resources/build/storage_resources_lib.jar")
3030
binary_to_array("storage_resources"
31-
"${CMAKE_CURRENT_LIST_DIR}/storage_resources/build/dexed.jar"
31+
"${CMAKE_CURRENT_LIST_DIR}/storage_resources/build/storage_resources_lib.jar"
3232
"firebase_storage_resources"
3333
"${FIREBASE_GEN_FILE_DIR}/storage")
3434

0 commit comments

Comments
 (0)