0

Nest android_toolchain content under ndk/

This prevents files in the top-level folder (owned by Chromium)
conflicting with files that are copied from the NDK, which results in
git thinking files have been modified when they haven't.

Bug: 1469911
Change-Id: I10a6122a6ddaaaf6a9cdbbd3cbdba94d0ac0ce12
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4728129
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Commit-Queue: Nathaniel Manista <nathaniel@google.com>
Cr-Commit-Position: refs/heads/main@{#1179753}
This commit is contained in:
Nathaniel Manista
2023-08-04 19:06:45 +00:00
committed by Chromium LUCI CQ
parent 308ae4e185
commit 0c2f240e34
15 changed files with 32 additions and 31 deletions
DEPS
android_webview/tools
base/allocator/partition_allocator
build
android
devil_chromium.json
pylib
constants
tests
symbolize
config
build_overrides
components/cronet/android
docs
third_party
tools
binary_size
libsupersize
clang
scripts
perf
chrome_telemetry_build

2
DEPS

@ -1017,7 +1017,7 @@ deps = {
'dep_type': 'cipd',
},
'src/third_party/android_toolchain': {
'src/third_party/android_toolchain/ndk': {
'packages': [
{
'package': 'chromium/third_party/android_toolchain/android_toolchain',

@ -186,7 +186,7 @@ class SimplePerfRunner:
def RunSimplePerf(perf_data_path, args):
"""Runs the simple perf commandline."""
cmd = [
'third_party/android_toolchain/simpleperf/app_profiler.py',
'third_party/android_toolchain/ndk/simpleperf/app_profiler.py',
'--perf_data_path', perf_data_path, '--skip_collect_binaries'
]
if args.system_wide:
@ -223,7 +223,7 @@ class SimplePerfRunner:
def GetOriginalReportHtml(perf_data_path, report_html_path):
"""Gets the original report.html from running simpleperf."""
cmd = [
'third_party/android_toolchain/simpleperf/report_html.py',
'third_party/android_toolchain/ndk/simpleperf/report_html.py',
'--record_file', perf_data_path, '--report_path', report_html_path,
'--no_browser'
]

@ -69,7 +69,7 @@ namespace {
void NameRegion(void* start, size_t length, PageTag page_tag) {
// Important: All the names should be string literals. As per prctl.h in
// //third_party/android_toolchain the kernel keeps a pointer to the name
// //third_party/android_toolchain/ndk the kernel keeps a pointer to the name
// instead of copying it.
//
// Having the name in .rodata ensures that the pointer remains valid as

@ -23,32 +23,32 @@
"file_info": {
"android_armeabi-v7a": {
"local_paths": [
"../../third_party/android_toolchain/simpleperf/bin/android/arm/simpleperf"
"../../third_party/android_toolchain/ndk/simpleperf/bin/android/arm/simpleperf"
]
},
"android_arm64-v8a": {
"local_paths": [
"../../third_party/android_toolchain/simpleperf/bin/android/arm64/simpleperf"
"../../third_party/android_toolchain/ndk/simpleperf/bin/android/arm64/simpleperf"
]
},
"android_x86": {
"local_paths": [
"../../third_party/android_toolchain/simpleperf/bin/android/x86/simpleperf"
"../../third_party/android_toolchain/ndk/simpleperf/bin/android/x86/simpleperf"
]
},
"android_x86_64": {
"local_paths": [
"../../third_party/android_toolchain/simpleperf/bin/android/x86_64/simpleperf"
"../../third_party/android_toolchain/ndk/simpleperf/bin/android/x86_64/simpleperf"
]
},
"linux_x86": {
"local_paths": [
"../../third_party/android_toolchain/simpleperf/bin/linux/x86/simpleperf"
"../../third_party/android_toolchain/ndk/simpleperf/bin/linux/x86/simpleperf"
]
},
"linux_x86_64": {
"local_paths": [
"../../third_party/android_toolchain/simpleperf/bin/linux/x86_64/simpleperf"
"../../third_party/android_toolchain/ndk/simpleperf/bin/linux/x86_64/simpleperf"
]
}
}
@ -57,7 +57,7 @@
"file_info": {
"default": {
"local_paths": [
"../../third_party/android_toolchain/simpleperf"
"../../third_party/android_toolchain/ndk/simpleperf"
]
}
}

@ -120,7 +120,7 @@ ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT, 'third_party', 'android_sdk',
ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT,
'build-tools', ANDROID_SDK_BUILD_TOOLS_VERSION)
ANDROID_NDK_ROOT = os.path.join(DIR_SOURCE_ROOT, 'third_party',
'android_toolchain')
'android_toolchain', 'ndk')
BAD_DEVICES_JSON = os.path.join(DIR_SOURCE_ROOT,
os.environ.get('CHROMIUM_OUT_DIR', 'out'),

@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
TOOLCHAIN=../../../../third_party/android_toolchain/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86_64/bin/arm-linux-androideabi-
TOOLCHAIN=../../../../third_party/android_toolchain/ndk/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86_64/bin/arm-linux-androideabi-
CXX=$(TOOLCHAIN)g++
lib%.so: %.cc

@ -102,7 +102,7 @@ if (is_android || is_chromeos) {
}
if (!defined(default_android_ndk_root)) {
default_android_ndk_root = "//third_party/android_toolchain"
default_android_ndk_root = "//third_party/android_toolchain/ndk"
default_android_ndk_version = "r25c"
default_android_ndk_major_version = 25
} else {

@ -29,12 +29,12 @@ __filegroups = {
"type": "glob",
"includes": ["*.h", "crtbegin.o"],
},
"third_party/android_toolchain/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include:include": {
"third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include:include": {
"type": "glob",
"includes": ["*"],
# can't use "*.h", because c++ headers have no extension.
},
"third_party/android_toolchain/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/local/include:include": {
"third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/local/include:include": {
"type": "glob",
"includes": ["*"],
},
@ -60,9 +60,9 @@ def __step_config(ctx, step_config):
"build/linux/debian_bullseye_i386-sysroot/usr/include:include",
"build/linux/debian_bullseye_i386-sysroot/usr/lib:headers",
],
"third_party/android_toolchain/toolchains/llvm/prebuilt/linux-x86_64/sysroot:headers": [
"third_party/android_toolchain/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include:include",
"third_party/android_toolchain/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/local/include:include",
"third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot:headers": [
"third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include:include",
"third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/local/include:include",
],
})
step_config["input_deps"].update(clang_all.input_deps)

@ -7,7 +7,7 @@ import("//build/config/gclient_args.gni")
# Uncomment these to specify a different NDK location and version in
# non-Chromium builds.
# default_android_ndk_root = "//third_party/android_toolchain"
# default_android_ndk_root = "//third_party/android_toolchain/ndk"
# default_android_ndk_version = "r10e"
# Some non-Chromium builds don't support building java targets.

@ -42,7 +42,7 @@
//net/traffic_annotation
//third_party/abseil-cpp
//third_party/android_deps
//third_party/android_toolchain
//third_party/android_toolchain/ndk
//third_party/android_sdk
//third_party/androidx
//third_party/ashmem

@ -211,7 +211,7 @@ If the above step fails or to run stuff without Chromium testing script (ex.
ContentShell.apk, or any third party apk or binary), device setup is needed:
```shell
tools/android/asan/third_party/asan_device_setup.sh \
--lib third_party/android_toolchain/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/*/lib/linux
--lib third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/*/lib/linux
# wait a few seconds for the device to reload
```
It only needs to be run once per device. It is safe to run it multiple times.

@ -19,7 +19,7 @@
/android_sdk/sources/
/android_support_test_runner/lib/
/android_system_sdk/*.jar
/android_toolchain/
/android_toolchain/ndk/
/android_tools_internal/
/android_webview_glue/src
/androidx/BUILD.gn

@ -155,14 +155,14 @@ def GetObjDumpPath():
def GetDisassembleObjDumpPath(arch):
path = None
if arch == 'arm':
path = FromToolsSrcRoot('third_party', 'android_toolchain', 'toolchains',
'arm-linux-androideabi-4.9', 'prebuilt',
'linux-x86_64', 'bin',
path = FromToolsSrcRoot('third_party', 'android_toolchain', 'ndk',
'toolchains', 'arm-linux-androideabi-4.9',
'prebuilt', 'linux-x86_64', 'bin',
'arm-linux-androideabi-objdump')
elif arch == 'arm64':
path = FromToolsSrcRoot('third_party', 'android_toolchain', 'toolchains',
'aarch64-linux-android-4.9', 'prebuilt',
'linux-x86_64', 'bin',
path = FromToolsSrcRoot('third_party', 'android_toolchain', 'ndk',
'toolchains', 'aarch64-linux-android-4.9',
'prebuilt', 'linux-x86_64', 'bin',
'aarch64-linux-android-objdump')
if path and os.path.exists(path):
return path

@ -55,7 +55,8 @@ LLVM_INSTRUMENTED_DIR = os.path.join(THIRD_PARTY_DIR, 'llvm-instrumented')
LLVM_PROFDATA_FILE = os.path.join(LLVM_INSTRUMENTED_DIR, 'profdata.prof')
LLVM_BUILD_TOOLS_DIR = os.path.abspath(
os.path.join(LLVM_DIR, '..', 'llvm-build-tools'))
ANDROID_NDK_DIR = os.path.join(CHROMIUM_DIR, 'third_party', 'android_toolchain')
ANDROID_NDK_DIR = os.path.join(CHROMIUM_DIR, 'third_party',
'android_toolchain', 'ndk')
FUCHSIA_SDK_DIR = os.path.join(CHROMIUM_DIR, 'third_party', 'fuchsia-sdk',
'sdk')
PINNED_CLANG_DIR = os.path.join(LLVM_BUILD_TOOLS_DIR, 'pinned-clang')

@ -211,7 +211,7 @@ group("telemetry_chrome_test_without_chrome") {
# These dependencies are necessary for running Telemetry tests in an
# Android emulator.
"//third_party/android_toolchain/simpleperf/",
"//third_party/android_toolchain/ndk/simpleperf/",
"//third_party/android_sdk/public/",
"//tools/android/avd/proto/",
]