diff --git a/packages/app/ios_config.sh b/packages/app/ios_config.sh index 31c6f9d715..15bb54473e 100755 --- a/packages/app/ios_config.sh +++ b/packages/app/ios_config.sh @@ -94,6 +94,14 @@ if [[ ${_SEARCH_RESULT} ]]; then _PLIST_ENTRY_VALUES+=("$(jsonBoolToYesNo "$_ANALYTICS_AUTO_COLLECTION")") fi + # config.perf_auto_collection_enabled + _PERF_AUTO_COLLECTION=$(getFirebaseJsonKeyValue "$_JSON_OUTPUT_RAW" "perf_auto_collection_enabled") + if [[ $_PERF_AUTO_COLLECTION ]]; then + _PLIST_ENTRY_KEYS+=("firebase_performance_collection_enabled") + _PLIST_ENTRY_TYPES+=("bool") + _PLIST_ENTRY_VALUES+=("$(jsonBoolToYesNo "$_PERF_AUTO_COLLECTION")") + fi + # config.messaging_auto_init_enabled _MESSAGING_AUTO_INIT=$(getFirebaseJsonKeyValue "$_JSON_OUTPUT_RAW" "messaging_auto_init_enabled") if [[ $_MESSAGING_AUTO_INIT ]]; then diff --git a/packages/perf/android/build.gradle b/packages/perf/android/build.gradle index 4ded74ae2e..80cfbc7b54 100644 --- a/packages/perf/android/build.gradle +++ b/packages/perf/android/build.gradle @@ -63,9 +63,22 @@ project.ext { ]) } +apply from: file("./../../app/android/firebase-json.gradle") + +def autoCollectionEnabled = "true" + +if (rootProject.ext && rootProject.ext.firebaseJson) { + if (rootProject.ext.firebaseJson.isFlagEnabled("perf_auto_collection_enabled", true) == false) { + autoCollectionEnabled = "false" + } +} + android { defaultConfig { multiDexEnabled true + manifestPlaceholders = [ + firebaseJsonAutoCollectionEnabled: autoCollectionEnabled + ] } lintOptions { disable 'GradleCompatible' diff --git a/packages/perf/android/src/main/AndroidManifest.xml b/packages/perf/android/src/main/AndroidManifest.xml index 4ed0b02e04..3d3990bd97 100644 --- a/packages/perf/android/src/main/AndroidManifest.xml +++ b/packages/perf/android/src/main/AndroidManifest.xml @@ -1,2 +1,10 @@ - + + + + + + \ No newline at end of file diff --git a/tests/firebase.json b/tests/firebase.json index fd13dd68e3..9ca386ebf7 100644 --- a/tests/firebase.json +++ b/tests/firebase.json @@ -17,7 +17,8 @@ "analytics_auto_collection_enabled": true, - "TODO_perf_auto_collection_enabled": true, + "perf_auto_collection_enabled": true, + "TODO_in_app_messaging_auto_collection_enabled": true, "TODO_database_persistence_enabled": true, "TODO_firestore_persistence_enabled": true,