VPN-6581 disable adjust (#10173)

mozilla-mobile · Jan 9, 2025 · b589939 · b589939
1 parent 31eb72f
commit b589939
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 44 deletions.
diff --git 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
@@ -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()