Skip to content

Commit fc2a8a2

Browse files
mcleinmanmcleinman
committed
getting towards minimal diff
1 parent af5aa3c commit fc2a8a2

File tree

12 files changed

+22
-106
lines changed

12 files changed

+22
-106
lines changed

‎android/adjust/build.gradle‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ android {
1212
targetSdkVersion Config.targetSdkVersion
1313

1414
buildConfigField "String", "ADJUST_SDK_TOKEN" , '"' + (project.properties["adjusttoken"] ?: "no_token_found") + '"'
15-
externalNativeBuild {
16-
cmake {
17-
arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
18-
}
19-
}
2015
}
2116
sourceSets {
2217
main {

‎android/build.gradle‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,6 @@ android {
147147
targetSdkVersion Config.targetSdkVersion
148148
versionCode System.getenv("VERSIONCODE")? System.getenv("VERSIONCODE")?.toInteger() : 99999
149149
versionName System.getenv("SHORTVERSION") ? System.getenv("SHORTVERSION"): ""
150-
externalNativeBuild {
151-
cmake {
152-
arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
153-
}
154-
}
155150

156151
}
157152
compileOptions {

‎android/buildSrc/build.gradle.kts‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,3 @@ plugins {
1111
repositories {
1212
mavenCentral()
1313
}
14-
15-
// android {
16-
// defaultConfig {
17-
// externalNativeBuild {
18-
// cmake {
19-
// arguments += listOf("-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON")
20-
// }
21-
// }
22-
// }
23-
// }

‎android/common/build.gradle‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ android {
1919
buildConfigField "String", "ADJUST_SDK_TOKEN" , '"' + (project.properties["adjusttoken"] ?: "no_token_found") + '"'
2020

2121
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
22-
externalNativeBuild {
23-
cmake {
24-
arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
25-
}
26-
}
2722
}
2823

2924
namespace 'org.mozilla.firefox.qt.common'

‎android/daemon/build.gradle‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@ android {
3838
buildConfigField "String", "ADJUST_SDK_TOKEN" , '"' + (project.properties["adjusttoken"] ?: "no_token_found") + '"'
3939

4040
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
41-
42-
externalNativeBuild {
43-
cmake {
44-
arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
45-
}
46-
}
4741
}
4842

4943
namespace 'org.mozilla.firefox.vpn.daemon'

‎android/qtglean/build.gradle‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ android {
2929
targetSdkVersion Config.targetSdkVersion
3030
buildConfigField "int", "VERSION_CODE", System.getenv("VERSIONCODE") ?: "99999"
3131
buildConfigField "String", "VERSION_NAME", '"' + (System.getenv("SHORTVERSION") ?: "") + '"'
32-
33-
externalNativeBuild {
34-
cmake {
35-
arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
36-
}
37-
}
3832
}
3933

4034
sourceSets {

‎android/tunnel/build.gradle.kts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,6 @@ android {
6464
targets.add("go_shared_lib")
6565
}
6666
}
67-
68-
externalNativeBuild {
69-
cmake {
70-
arguments += listOf("-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON")
71-
}
72-
}
7367
}
7468
// Configure ndk-build integration
7569
externalNativeBuild {

‎android/tunnel/src/go/CMakeLists.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,7 @@ set(NDK_TOOLCHAIN "${ANDROID_NDK}/toolchains/llvm/prebuilt/$<LOWER_CASE:${CMAKE_
3535

3636
# Set paths explicitly for CGO
3737
set(CGO_CFLAGS "--sysroot=${NDK_TOOLCHAIN}/sysroot -I${NDK_TOOLCHAIN}/sysroot/usr/include")
38-
# set(CGO_LDFLAGS "--sysroot=${NDK_TOOLCHAIN}/sysroot -L${NDK_TOOLCHAIN}/sysroot/usr/lib/${GO_TRIPLE}/${ANDROID_API_LEVEL} -llog")
3938
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")
40-
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,max-page-size=16384 -Wl,-z,common-page-size=16384")
41-
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,max-page-size=16384 -Wl,-z,common-page-size=16384")
4239

4340
# Go build environment
4441
set(GO_ENV

‎android/vpnClient/build.gradle‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@ android {
3636

3737
buildConfigField "int", "VERSION_CODE", System.getenv("VERSIONCODE") ?: "99999"
3838
buildConfigField "String", "VERSION_NAME", '"' + (System.getenv("SHORTVERSION") ?: "") + '"'
39-
40-
externalNativeBuild {
41-
cmake {
42-
arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
43-
}
44-
}
4539
}
4640

4741
buildFeatures {

‎qtglean/CMakeLists.txt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,7 @@ if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
114114

115115
# On Android we will build a dynamic lib,
116116
# so that it can be linked to both the main app and the daemon.
117-
# set(RUSTFLAGS "-Ctarget-feature=-crt-static -Wl,-z,max-page-size=16384 -Wl,-z,common-page-size=16384") # this is the latest change
118117
set(RUSTFLAGS "-Ctarget-feature=-crt-static -C link-arg=-Wl,-z,max-page-size=16384 -C link-arg=-Wl,-z,common-page-size=16384")
119-
set(CGO_LDFLAGS "-Wl,-z,max-page-size=16384 -Wl,-z,common-page-size=16384")
120-
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,max-page-size=16384 -Wl,-z,common-page-size=16384")
121-
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,max-page-size=16384 -Wl,-z,common-page-size=16384")
122-
# target_link_libraries(qtglean PRIVATE "-Wl,-z,max-page-size=16384" "-Wl,-z,common-page-size=16384")
123118
set(SHARED 1)
124119
elseif(QT_FEATURE_static AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked)
125120
# If Qt is statically linked to OpenSSL, so to should the glean libs.

0 commit comments

Comments
 (0)