getting towards minimal diff

mcleinman · mcleinman · commit 7f018e911577 · 2025-10-28T15:07:29.000-07:00
diff --git a/android/adjust/build.gradle b/android/adjust/build.gradle
@@ -12,11 +12,6 @@ android {
         targetSdkVersion Config.targetSdkVersion
 
         buildConfigField  "String", "ADJUST_SDK_TOKEN" ,  '"' + (project.properties["adjusttoken"] ?: "no_token_found") +  '"'
-        externalNativeBuild {
-          cmake {
-            arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
-          }
-        }
     }
     sourceSets {
         main {
diff --git a/android/build.gradle b/android/build.gradle
@@ -147,11 +147,6 @@ android {
         targetSdkVersion Config.targetSdkVersion
         versionCode  System.getenv("VERSIONCODE")? System.getenv("VERSIONCODE")?.toInteger() : 99999
         versionName  System.getenv("SHORTVERSION") ? System.getenv("SHORTVERSION"): ""
-        externalNativeBuild {
-          cmake {
-            arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
-          }
-        }
 
     }
     compileOptions {
diff --git a/android/buildSrc/build.gradle.kts b/android/buildSrc/build.gradle.kts
@@ -11,13 +11,3 @@ plugins {
 repositories {
     mavenCentral()
 }
-
-// android {
-//   defaultConfig {
-//     externalNativeBuild {
-//           cmake {
-//             arguments += listOf("-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON")
-//           }
-//     }
-//   }
-// }
diff --git a/android/common/build.gradle b/android/common/build.gradle
@@ -19,11 +19,6 @@ android {
         buildConfigField  "String", "ADJUST_SDK_TOKEN" ,  '"' + (project.properties["adjusttoken"] ?: "no_token_found") +  '"'
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        externalNativeBuild {
-          cmake {
-            arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
-          }
-        }
     }
 
     namespace 'org.mozilla.firefox.qt.common'
diff --git a/android/daemon/build.gradle b/android/daemon/build.gradle
@@ -39,11 +39,6 @@ android {
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
-        externalNativeBuild {
-          cmake {
-            arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
-          }
-      }
     }
 
     namespace 'org.mozilla.firefox.vpn.daemon'
diff --git a/android/qtglean/build.gradle b/android/qtglean/build.gradle
@@ -29,12 +29,6 @@ android {
         targetSdkVersion Config.targetSdkVersion
         buildConfigField "int", "VERSION_CODE", System.getenv("VERSIONCODE") ?: "99999"
         buildConfigField "String", "VERSION_NAME", '"' + (System.getenv("SHORTVERSION") ?: "") + '"'
-
-        externalNativeBuild {
-          cmake {
-            arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
-          }
-        }
     }
 
     sourceSets {
diff --git a/android/tunnel/build.gradle.kts b/android/tunnel/build.gradle.kts
@@ -64,12 +64,6 @@ android {
                 targets.add("go_shared_lib")
             }
         }
-
-        externalNativeBuild {
-          cmake {
-            arguments += listOf("-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON")
-          }
-        }
     }
     // Configure ndk-build integration
     externalNativeBuild {
diff --git a/android/tunnel/src/go/CMakeLists.txt b/android/tunnel/src/go/CMakeLists.txt
@@ -35,10 +35,7 @@ set(NDK_TOOLCHAIN "${ANDROID_NDK}/toolchains/llvm/prebuilt/$<LOWER_CASE:${CMAKE_
 
 # Set paths explicitly for CGO
 set(CGO_CFLAGS "--sysroot=${NDK_TOOLCHAIN}/sysroot -I${NDK_TOOLCHAIN}/sysroot/usr/include")
-# set(CGO_LDFLAGS "--sysroot=${NDK_TOOLCHAIN}/sysroot -L${NDK_TOOLCHAIN}/sysroot/usr/lib/${GO_TRIPLE}/${ANDROID_API_LEVEL} -llog")
 set(CGO_LDFLAGS "--sysroot=${NDK_TOOLCHAIN}/sysroot -L${NDK_TOOLCHAIN}/sysroot/usr/lib/${GO_TRIPLE}/${ANDROID_API_LEVEL} -Wl,-z,max-page-size=16384 -Wl,-z,common-page-size=16384 -llog")
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,max-page-size=16384 -Wl,-z,common-page-size=16384")
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,max-page-size=16384 -Wl,-z,common-page-size=16384")
 
 # Go build environment
 set(GO_ENV
diff --git a/android/vpnClient/build.gradle b/android/vpnClient/build.gradle
@@ -36,12 +36,6 @@ android {
 
         buildConfigField "int", "VERSION_CODE", System.getenv("VERSIONCODE") ?: "99999"
         buildConfigField "String", "VERSION_NAME", '"' + (System.getenv("SHORTVERSION") ?: "") + '"'
-
-        externalNativeBuild {
-          cmake {
-            arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
-          }
-        }
     }
 
     buildFeatures {
diff --git a/qtglean/CMakeLists.txt b/qtglean/CMakeLists.txt
@@ -114,12 +114,7 @@ if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
 
         # On Android we will build a dynamic lib,
         # so that it can be linked to both the main app and the daemon.
-        # set(RUSTFLAGS "-Ctarget-feature=-crt-static -Wl,-z,max-page-size=16384 -Wl,-z,common-page-size=16384") # this is the latest change
         set(RUSTFLAGS "-Ctarget-feature=-crt-static -C link-arg=-Wl,-z,max-page-size=16384 -C link-arg=-Wl,-z,common-page-size=16384")
-        set(CGO_LDFLAGS "-Wl,-z,max-page-size=16384 -Wl,-z,common-page-size=16384")
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,max-page-size=16384 -Wl,-z,common-page-size=16384")
-        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,max-page-size=16384 -Wl,-z,common-page-size=16384")
-        # target_link_libraries(qtglean PRIVATE "-Wl,-z,max-page-size=16384" "-Wl,-z,common-page-size=16384")
         set(SHARED 1)
     elseif(QT_FEATURE_static AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked)
         # If Qt is statically linked to OpenSSL, so to should the glean libs.
diff --git a/src/cmake/android.cmake b/src/cmake/android.cmake
@@ -43,7 +43,6 @@ target_sources(mozillavpn PRIVATE
 get_property(OPENSSL_LIBS_DIR GLOBAL PROPERTY OPENSSL_LIBS)
 get_property(QTGLEAN_LIB_LOCATION TARGET qtglean_bindings PROPERTY LOCATION_${CMAKE_BUILD_TYPE})
 
-target_link_options(mozillavpn PRIVATE "-Wl,-z,max-page-size=16384")
 # This property flags the build system to copy these
 # shared libraries into the expected Android shared library folder.
 #
@@ -71,7 +70,6 @@ set_property(TARGET mozillavpn PROPERTY QT_ANDROID_EXTRA_LIBS
 
 
 if( ${Qt6_VERSION} VERSION_GREATER_EQUAL 6.4.0)
-    message("MATTHEW2 ${OPENSSL_LIBS_DIR}") # /Users/mcleinman/code/vpn-client-android/.tmp/ndk_openssl/libs
     set_property(TARGET mozillavpn PROPERTY QT_ANDROID_EXTRA_LIBS
         ${OPENSSL_LIBS_DIR}/libcrypto_3.so
         ${OPENSSL_LIBS_DIR}/libssl_3.so
diff --git a/src/cmake/android_openssl.cmake b/src/cmake/android_openssl.cmake
@@ -57,8 +57,6 @@ SET( _OPENSSL_MODULE "${android_openssl_SOURCE_DIR}/ssl_1.1/${ANDROID_ABI}/")
 SET( _OPENSSL_LIBS "${android_openssl_SOURCE_DIR}/combined_libs") 
 file(MAKE_DIRECTORY ${_OPENSSL_LIBS})
 
-
-set_property(GLOBAL PROPERTY OPENSSL_CRYPTO_MODULE ${_OPENSSL_MODULE})
 set_property(GLOBAL PROPERTY OPENSSL_SSL_MODULE ${_OPENSSL_MODULE})
 set_property(GLOBAL PROPERTY OPENSSL_LIBS ${_OPENSSL_LIBS})
 

Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,6 @@ android {`
`39`	`39`
`40`	`40`	`testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"`
`41`	`41`
`42`		`- externalNativeBuild {`
`43`		`- cmake {`
`44`		`- arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"`
`45`		`- }`
`46`		`- }`
`47`	`42`	`}`
`48`	`43`
`49`	`44`	`namespace 'org.mozilla.firefox.vpn.daemon'`
Original file line number	Diff line number	Diff line change
`@@ -64,12 +64,6 @@ android {`
`64`	`64`	`targets.add("go_shared_lib")`
`65`	`65`	`}`
`66`	`66`	`}`
`67`		`-`
`68`		`- externalNativeBuild {`
`69`		`- cmake {`
`70`		`- arguments += listOf("-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON")`
`71`		`- }`
`72`		`- }`
`73`	`67`	`}`
`74`	`68`	`// Configure ndk-build integration`
`75`	`69`	`externalNativeBuild {`