aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gn/BUILD.gn12
-rw-r--r--gn/BUILDCONFIG.gn14
-rw-r--r--infra/bots/jobs.json4
-rw-r--r--infra/bots/recipes/compile.expected/Build-Debian9-Clang-mipsel-Debug-Android.json192
-rw-r--r--infra/bots/recipes/compile.py1
-rw-r--r--infra/bots/tasks.json128
-rw-r--r--infra/branch-config/cq.cfg1
-rw-r--r--platform_tools/android/apps/build.gradle6
-rw-r--r--platform_tools/android/apps/viewer/build.gradle2
-rwxr-xr-xplatform_tools/android/bin/android_build_app4
-rw-r--r--site/user/build.md10
-rw-r--r--third_party/dng_sdk/BUILD.gn2
12 files changed, 7 insertions, 369 deletions
diff --git a/gn/BUILD.gn b/gn/BUILD.gn
index 7791c1b999..363965fa98 100644
--- a/gn/BUILD.gn
+++ b/gn/BUILD.gn
@@ -137,11 +137,6 @@ config("default") {
"-mfpu=neon",
"-mthumb",
]
- } else if (current_cpu == "mipsel") {
- cflags += [ "-march=mips32r2" ]
- } else if (current_cpu == "mips64el") {
- asmflags += [ "-integrated-as" ]
- cflags += [ "-integrated-as" ]
} else if (current_cpu == "x86" && !is_win) {
asmflags += [ "-m32" ]
cflags += [
@@ -185,13 +180,6 @@ config("default") {
"$ndk/toolchains/$ndk_gccdir-4.9/prebuilt/$ndk_host/lib/gcc/$ndk_target/4.9.x",
]
- if (current_cpu == "mips64el") {
- # The r15b NDK deployed on our bots fails to find /usr/lib64 in the
- # MIPS64 sysroots, so we must point Clang at /usr/lib64 manually.
- lib_dirs += [ "$ndk/platforms/$ndk_platform/usr/lib64" ]
- ldflags += [ "-B$ndk/platforms/$ndk_platform/usr/lib64" ]
- }
-
libs += [ "gnustl_static" ]
}
diff --git a/gn/BUILDCONFIG.gn b/gn/BUILDCONFIG.gn
index 646e277ca3..b81680aa88 100644
--- a/gn/BUILDCONFIG.gn
+++ b/gn/BUILDCONFIG.gn
@@ -13,7 +13,7 @@ declare_args() {
ndk = ""
# It's nice to keep ndk_api set to what Clank targets, but probably no big deal if we can't.
- if (target_cpu == "x86" || target_cpu == "mipsel" || target_cpu == "arm") {
+ if (target_cpu == "x86" || target_cpu == "arm") {
ndk_api = 16
} else {
ndk_api = 21
@@ -115,18 +115,6 @@ if (is_android) {
ndk_stdlib = "armeabi-v7a"
ndk_gccdir = ndk_target
ndk_gdbserver = "prebuilt/android-arm/gdbserver/gdbserver"
- } else if (target_cpu == "mips64el") {
- ndk_target = "mips64el-linux-android"
- ndk_platform = "android-${ndk_api}/arch-mips64"
- ndk_stdlib = "mips64"
- ndk_gccdir = ndk_target
- ndk_gdbserver = "prebuilt/android-mips64/gdbserver/gdbserver"
- } else if (target_cpu == "mipsel") {
- ndk_target = "mipsel-linux-android"
- ndk_platform = "android-${ndk_api}/arch-mips"
- ndk_stdlib = "mips"
- ndk_gccdir = ndk_target
- ndk_gdbserver = "prebuilt/android-mips/gdbserver/gdbserver"
} else if (target_cpu == "x64") {
ndk_target = "x86_64-linux-android"
ndk_platform = "android-${ndk_api}/arch-x86_64"
diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 753a34a334..ff3054e1f4 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -8,10 +8,6 @@
"Build-Debian9-Clang-arm64-Debug-Android_Vulkan",
"Build-Debian9-Clang-arm64-Release-Android",
"Build-Debian9-Clang-arm64-Release-Android_Vulkan",
- "Build-Debian9-Clang-mips64el-Debug-Android",
- "Build-Debian9-Clang-mips64el-Release-Android",
- "Build-Debian9-Clang-mipsel-Debug-Android",
- "Build-Debian9-Clang-mipsel-Release-Android",
"Build-Debian9-Clang-x64-Debug-Android",
"Build-Debian9-Clang-x64-Release-Android",
"Build-Debian9-Clang-x86-Debug",
diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-mipsel-Debug-Android.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-mipsel-Debug-Android.json
deleted file mode 100644
index 1382883f87..0000000000
--- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-mipsel-Debug-Android.json
+++ /dev/null
@@ -1,192 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CUSTOM_/_B_WORK]"
- ],
- "infra_step": true,
- "name": "makedirs checkout_path"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CUSTOM_/_B_WORK]/.gclient_entries"
- ],
- "infra_step": true,
- "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
- "--spec-path",
- "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]",
- "--patch_root",
- "skia",
- "--revision_mapping_file",
- "{\"got_revision\": \"skia\"}",
- "--git-cache-dir",
- "[CUSTOM_/_B_CACHE]",
- "--cleanup-dir",
- "[CLEANUP]/bot_update",
- "--output_json",
- "/path/to/tmp/json",
- "--revision",
- "skia@abc123"
- ],
- "cwd": "[CUSTOM_/_B_WORK]",
- "env_prefixes": {
- "PATH": [
- "RECIPE_PACKAGE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "bot_update",
- "~followup_annotations": [
- "@@@STEP_TEXT@Some step text@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/skia.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"skia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#164710}\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"skia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/skia.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 0@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn"
- ],
- "cwd": "[CUSTOM_/_B_WORK]/skia",
- "env": {
- "BUILDTYPE": "Debug",
- "CC": "/usr/bin/clang",
- "CHROME_HEADLESS": "1",
- "CXX": "/usr/bin/clang++",
- "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-mipsel-Debug-Android"
- },
- "infra_step": true,
- "name": "fetch-gn"
- },
- {
- "cmd": [
- "[CUSTOM_/_B_WORK]/skia/bin/gn",
- "gen",
- "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-mipsel-Debug-Android/Debug",
- "--args=extra_cflags=[\"-O1\"] ndk=\"[START_DIR]/android_ndk_linux\" target_cpu=\"mipsel\""
- ],
- "cwd": "[CUSTOM_/_B_WORK]/skia",
- "env": {
- "BUILDTYPE": "Debug",
- "CC": "/usr/bin/clang",
- "CHROME_HEADLESS": "1",
- "CXX": "/usr/bin/clang++",
- "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-mipsel-Debug-Android"
- },
- "name": "gn gen"
- },
- {
- "cmd": [
- "ninja",
- "-k",
- "0",
- "-C",
- "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-mipsel-Debug-Android/Debug"
- ],
- "cwd": "[CUSTOM_/_B_WORK]/skia",
- "env": {
- "BUILDTYPE": "Debug",
- "CC": "/usr/bin/clang",
- "CHROME_HEADLESS": "1",
- "CXX": "/usr/bin/clang++",
- "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-mipsel-Debug-Android"
- },
- "name": "ninja"
- },
- {
- "cmd": [
- "python",
- "-u",
- "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
- "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-mipsel-Debug-Android/Debug",
- "[CUSTOM_[SWARM_OUT_DIR]]/out/Debug"
- ],
- "infra_step": true,
- "name": "copy build products",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@import errno@@@",
- "@@@STEP_LOG_LINE@python.inline@import glob@@@",
- "@@@STEP_LOG_LINE@python.inline@import os@@@",
- "@@@STEP_LOG_LINE@python.inline@import shutil@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@",
- "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'vulkan-1.dll']@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@try:@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@",
- "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@",
- "@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@",
- "@@@STEP_LOG_LINE@python.inline@ raise@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@",
- "@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@",
- "@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@",
- "@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@",
- "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-] \ No newline at end of file
diff --git a/infra/bots/recipes/compile.py b/infra/bots/recipes/compile.py
index 3c3ea87ce7..d628a0038f 100644
--- a/infra/bots/recipes/compile.py
+++ b/infra/bots/recipes/compile.py
@@ -77,7 +77,6 @@ TEST_BUILDERS = [
'Build-Debian9-Clang-arm-Release-Chromebook_GLES',
'Build-Debian9-Clang-arm64-Release-Android',
'Build-Debian9-Clang-arm64-Release-Android_Vulkan',
- 'Build-Debian9-Clang-mipsel-Debug-Android',
'Build-Debian9-Clang-x86_64-Debug',
'Build-Debian9-Clang-x86_64-Debug-ASAN',
'Build-Debian9-Clang-x86_64-Debug-Coverage',
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index deba86832c..c334c50546 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -54,30 +54,6 @@
"Build-Debian9-Clang-arm64-Release-Android_Vulkan"
]
},
- "Build-Debian9-Clang-mips64el-Debug-Android": {
- "priority": 0.8,
- "tasks": [
- "Build-Debian9-Clang-mips64el-Debug-Android"
- ]
- },
- "Build-Debian9-Clang-mips64el-Release-Android": {
- "priority": 0.8,
- "tasks": [
- "Build-Debian9-Clang-mips64el-Release-Android"
- ]
- },
- "Build-Debian9-Clang-mipsel-Debug-Android": {
- "priority": 0.8,
- "tasks": [
- "Build-Debian9-Clang-mipsel-Debug-Android"
- ]
- },
- "Build-Debian9-Clang-mipsel-Release-Android": {
- "priority": 0.8,
- "tasks": [
- "Build-Debian9-Clang-mipsel-Release-Android"
- ]
- },
"Build-Debian9-Clang-x64-Debug-Android": {
"priority": 0.8,
"tasks": [
@@ -3209,110 +3185,6 @@
"isolate": "compile_skia.isolate",
"priority": 0.8
},
- "Build-Debian9-Clang-mips64el-Debug-Android": {
- "dependencies": [
- "Housekeeper-PerCommit-IsolateAndroidNDKLinux"
- ],
- "dimensions": [
- "cpu:x86-64-Haswell_GCE",
- "gpu:none",
- "os:Debian-9.2",
- "pool:Skia"
- ],
- "extra_args": [
- "--workdir",
- "../../..",
- "compile",
- "repository=<(REPO)",
- "buildername=Build-Debian9-Clang-mips64el-Debug-Android",
- "swarm_out_dir=${ISOLATED_OUTDIR}",
- "revision=<(REVISION)",
- "patch_repo=<(PATCH_REPO)",
- "patch_storage=<(PATCH_STORAGE)",
- "patch_issue=<(ISSUE)",
- "patch_set=<(PATCHSET)"
- ],
- "isolate": "compile_skia.isolate",
- "priority": 0.8
- },
- "Build-Debian9-Clang-mips64el-Release-Android": {
- "dependencies": [
- "Housekeeper-PerCommit-IsolateAndroidNDKLinux"
- ],
- "dimensions": [
- "cpu:x86-64-Haswell_GCE",
- "gpu:none",
- "os:Debian-9.2",
- "pool:Skia"
- ],
- "extra_args": [
- "--workdir",
- "../../..",
- "compile",
- "repository=<(REPO)",
- "buildername=Build-Debian9-Clang-mips64el-Release-Android",
- "swarm_out_dir=${ISOLATED_OUTDIR}",
- "revision=<(REVISION)",
- "patch_repo=<(PATCH_REPO)",
- "patch_storage=<(PATCH_STORAGE)",
- "patch_issue=<(ISSUE)",
- "patch_set=<(PATCHSET)"
- ],
- "isolate": "compile_skia.isolate",
- "priority": 0.8
- },
- "Build-Debian9-Clang-mipsel-Debug-Android": {
- "dependencies": [
- "Housekeeper-PerCommit-IsolateAndroidNDKLinux"
- ],
- "dimensions": [
- "cpu:x86-64-Haswell_GCE",
- "gpu:none",
- "os:Debian-9.2",
- "pool:Skia"
- ],
- "extra_args": [
- "--workdir",
- "../../..",
- "compile",
- "repository=<(REPO)",
- "buildername=Build-Debian9-Clang-mipsel-Debug-Android",
- "swarm_out_dir=${ISOLATED_OUTDIR}",
- "revision=<(REVISION)",
- "patch_repo=<(PATCH_REPO)",
- "patch_storage=<(PATCH_STORAGE)",
- "patch_issue=<(ISSUE)",
- "patch_set=<(PATCHSET)"
- ],
- "isolate": "compile_skia.isolate",
- "priority": 0.8
- },
- "Build-Debian9-Clang-mipsel-Release-Android": {
- "dependencies": [
- "Housekeeper-PerCommit-IsolateAndroidNDKLinux"
- ],
- "dimensions": [
- "cpu:x86-64-Haswell_GCE",
- "gpu:none",
- "os:Debian-9.2",
- "pool:Skia"
- ],
- "extra_args": [
- "--workdir",
- "../../..",
- "compile",
- "repository=<(REPO)",
- "buildername=Build-Debian9-Clang-mipsel-Release-Android",
- "swarm_out_dir=${ISOLATED_OUTDIR}",
- "revision=<(REVISION)",
- "patch_repo=<(PATCH_REPO)",
- "patch_storage=<(PATCH_STORAGE)",
- "patch_issue=<(ISSUE)",
- "patch_set=<(PATCHSET)"
- ],
- "isolate": "compile_skia.isolate",
- "priority": 0.8
- },
"Build-Debian9-Clang-x64-Debug-Android": {
"dependencies": [
"Housekeeper-PerCommit-IsolateAndroidNDKLinux"
diff --git a/infra/branch-config/cq.cfg b/infra/branch-config/cq.cfg
index de976d6b4f..50d29d3fdf 100644
--- a/infra/branch-config/cq.cfg
+++ b/infra/branch-config/cq.cfg
@@ -34,7 +34,6 @@ verifiers {
name: "skia.primary"
builders { name: "Build-Debian9-Clang-arm-Debug-Android" }
builders { name: "Build-Debian9-Clang-arm64-Debug-Android" }
- builders { name: "Build-Debian9-Clang-mips64el-Debug-Android" }
builders { name: "Build-Debian9-Clang-x86_64-Debug" }
builders { name: "Build-Debian9-GCC-arm-Debug-Chromecast" }
builders { name: "Build-Debian9-GCC-x86_64-Debug-NoGPU" }
diff --git a/platform_tools/android/apps/build.gradle b/platform_tools/android/apps/build.gradle
index 08dbc9f4f6..fe56520838 100644
--- a/platform_tools/android/apps/build.gradle
+++ b/platform_tools/android/apps/build.gradle
@@ -73,12 +73,6 @@ def getVariantOutDir(project, variant) {
} else if (variant.name.startsWith("x86")) {
variantPrefix = "x86"
androidLibDir = "x86"
- } else if (variant.name.startsWith("mipsel")) {
- variantPrefix = "mipsel"
- androidLibDir = "mips"
- } else if (variant.name.startsWith("mips64el")) {
- variantPrefix = "mips64el"
- androidLibDir = "mips64"
}
String skiaOutDir = null
diff --git a/platform_tools/android/apps/viewer/build.gradle b/platform_tools/android/apps/viewer/build.gradle
index e231a6f3d0..d39e896c41 100644
--- a/platform_tools/android/apps/viewer/build.gradle
+++ b/platform_tools/android/apps/viewer/build.gradle
@@ -24,7 +24,7 @@ android {
}
sourceSets.main.jni.srcDirs = [] //disable automatic ndk-build call
sourceSets.main.jniLibs.srcDir "src/main/libs"
- productFlavors { arm {}; arm64 {}; x86 {}; x64 {}; mipsel {}; mips64el {}; arm64vulkan{}; }
+ productFlavors { arm {}; arm64 {}; x86 {}; x64 {}; arm64vulkan{}; }
setupSkiaLibraryBuild(project, applicationVariants, "libviewer")
}
diff --git a/platform_tools/android/bin/android_build_app b/platform_tools/android/bin/android_build_app
index dae08530d2..31afe96c2d 100755
--- a/platform_tools/android/bin/android_build_app
+++ b/platform_tools/android/bin/android_build_app
@@ -40,10 +40,6 @@ elif target_cpu == "x86":
android_variant = "x86"
elif target_cpu == "x64":
android_variant = "x86_64"
-elif target_cpu == "mipsel":
- android_variant = "mips"
-elif target_cpu == "mips64el":
- android_variant = "mips64"
else:
sys.exit("unknown target_cpu")
diff --git a/site/user/build.md b/site/user/build.md
index a9114c53b7..ce5edbafc3 100644
--- a/site/user/build.md
+++ b/site/user/build.md
@@ -83,12 +83,10 @@ can use one of these commands to fetch the NDK our bots use:
When generating your GN build files, pass the path to your `ndk` and your
desired `target_cpu`:
- bin/gn gen out/arm --args='ndk="/tmp/ndk" target_cpu="arm"'
- bin/gn gen out/arm64 --args='ndk="/tmp/ndk" target_cpu="arm64"'
- bin/gn gen out/mips64el --args='ndk="/tmp/ndk" target_cpu="mips64el"'
- bin/gn gen out/mipsel --args='ndk="/tmp/ndk" target_cpu="mipsel"'
- bin/gn gen out/x64 --args='ndk="/tmp/ndk" target_cpu="x64"'
- bin/gn gen out/x86 --args='ndk="/tmp/ndk" target_cpu="x86"'
+ bin/gn gen out/arm --args='ndk="/tmp/ndk" target_cpu="arm"'
+ bin/gn gen out/arm64 --args='ndk="/tmp/ndk" target_cpu="arm64"'
+ bin/gn gen out/x64 --args='ndk="/tmp/ndk" target_cpu="x64"'
+ bin/gn gen out/x86 --args='ndk="/tmp/ndk" target_cpu="x86"'
Other arguments like `is_debug` and `is_component_build` continue to work.
Tweaking `ndk_api` gives you access to newer Android features like Vulkan.
diff --git a/third_party/dng_sdk/BUILD.gn b/third_party/dng_sdk/BUILD.gn
index 07b19905a8..4bd580a8ac 100644
--- a/third_party/dng_sdk/BUILD.gn
+++ b/third_party/dng_sdk/BUILD.gn
@@ -178,7 +178,7 @@ third_party("dng_sdk") {
"../externals/dng_sdk/source/dng_xy_coord.h",
]
- if (current_cpu == "x86" || current_cpu == "mipsel" || current_cpu == "arm") {
+ if (current_cpu == "x86" || current_cpu == "arm") {
# DNG SDK uses __builtin_smulll_overflow() to detect 64x64 bit multiply overflow.
# On some platforms, the compiler implements this with __mulodi4().
# I can't quite figure out how to link that here, so instead here's a shim for
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-18 16:08:07 +0000