From b58993985bdb11b3f4efb17ef8693dfe994bb3c3 Mon Sep 17 00:00:00 2001
From: MCleinman <9295855+mcleinman@users.noreply.github.com>
Date: Thu, 9 Jan 2025 09:21:36 -0800
Subject: [PATCH] VPN-6581 disable adjust (#10173)

---
 src/platforms/android/sources.cmake | 49 +++++++++++++++--------------
 src/platforms/ios/sources.cmake     | 41 ++++++++++++------------
 2 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/src/platforms/android/sources.cmake b/src/platforms/android/sources.cmake
index 46881f9d22..bc65eda15c 100644
--- a/src/platforms/android/sources.cmake
+++ b/src/platforms/android/sources.cmake
@@ -9,30 +9,31 @@ target_sources(shared-sources INTERFACE
      ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/androidcommons.h
 )
 
-if(ADJUST_TOKEN)
-    message("Adjust SDK enabled")
-    # SDK Token present, let's enable that.
-    target_compile_definitions(mozillavpn PUBLIC MZ_ADJUST)
+# Disabling Adjust per VPN-6581
+# if(ADJUST_TOKEN)
+#     message("Adjust SDK enabled")
+#     # SDK Token present, let's enable that.
+#     target_compile_definitions(mozillavpn PUBLIC MZ_ADJUST)
 
-    target_sources(shared-sources INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustfiltering.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustfiltering.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjusthandler.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjusthandler.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustproxy.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustproxy.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustproxyconnection.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustproxyconnection.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustproxypackagehandler.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustproxypackagehandler.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjusttasksubmission.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjusttasksubmission.h
-    )
-else()
-    if (${CMAKE_BUILD_TYPE} STREQUAL "Release")
-        message(${CMAKE_BUILD_TYPE})
-        message( FATAL_ERROR "Adjust token cannot be empty for release builds")
-    endif()
-endif()
+#     target_sources(shared-sources INTERFACE
+#         ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustfiltering.cpp
+#         ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustfiltering.h
+#         ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjusthandler.cpp
+#         ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjusthandler.h
+#         ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustproxy.cpp
+#         ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustproxy.h
+#         ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustproxyconnection.cpp
+#         ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustproxyconnection.h
+#         ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustproxypackagehandler.cpp
+#         ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustproxypackagehandler.h
+#         ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjusttasksubmission.cpp
+#         ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjusttasksubmission.h
+#     )
+# else()
+#     if (${CMAKE_BUILD_TYPE} STREQUAL "Release")
+#         message(${CMAKE_BUILD_TYPE})
+#         message( FATAL_ERROR "Adjust token cannot be empty for release builds")
+#     endif()
+# endif()
 
 target_link_libraries(shared-sources INTERFACE -ljnigraphics)
diff --git a/src/platforms/ios/sources.cmake b/src/platforms/ios/sources.cmake
index e1a56dd2ab..eb94bbb230 100644
--- a/src/platforms/ios/sources.cmake
+++ b/src/platforms/ios/sources.cmake
@@ -8,23 +8,24 @@ target_sources(shared-sources INTERFACE
 )
 
 # Include the Adjust SDK
-if(BUILD_ADJUST_SDK_TOKEN)
-    target_compile_definitions(mozillavpn PUBLIC MZ_ADJUST)
-    target_sources(shared-sources INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustfiltering.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustfiltering.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjusthandler.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjusthandler.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustproxy.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustproxy.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustproxyconnection.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustproxyconnection.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustproxypackagehandler.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustproxypackagehandler.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjusttasksubmission.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjusttasksubmission.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/iosadjusthelper.mm
-        ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/iosadjusthelper.h
-    )
-    target_link_libraries(shared-sources INTERFACE adjust)
-endif()
+# Disabling Adjust per VPN-6581
+# if(BUILD_ADJUST_SDK_TOKEN)
+#     target_compile_definitions(mozillavpn PUBLIC MZ_ADJUST)
+#     target_sources(shared-sources INTERFACE
+#         ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustfiltering.cpp
+#         ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustfiltering.h
+#         ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjusthandler.cpp
+#         ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjusthandler.h
+#         ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustproxy.cpp
+#         ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustproxy.h
+#         ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustproxyconnection.cpp
+#         ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustproxyconnection.h
+#         ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustproxypackagehandler.cpp
+#         ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjustproxypackagehandler.h
+#         ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjusttasksubmission.cpp
+#         ${CMAKE_CURRENT_SOURCE_DIR}/adjust/adjusttasksubmission.h
+#         ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/iosadjusthelper.mm
+#         ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/iosadjusthelper.h
+#     )
+#     target_link_libraries(shared-sources INTERFACE adjust)
+# endif()