Skip to content
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

VPN-6581: disable adjust #10173

Merged
merged 1 commit into from
Jan 9, 2025
Merged

VPN-6581: disable adjust #10173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 25 additions & 24 deletions src/platforms/android/sources.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
41 changes: 21 additions & 20 deletions src/platforms/ios/sources.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Loading