diff options
| author | Shenghua Zhang <shenghuazhang@chromium.org> | 2018-01-09 17:44:46 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2018-01-10 19:25:11 +0000 |
| commit | caeb9dca7a00276758aa53b833099beb294cc328 (patch) | |
| tree | aca8bfacd617f704eed0cc7ec4487555a0340c35 | |
| parent | 36948919222d38467b8031891540f2f4f4e0caad (diff) | |
| download | libyuv-caeb9dca7a00276758aa53b833099beb294cc328.tar.gz | |
[ndk] Add android ndk deps in libyuv DEPS
Because of the android sdk managed by CIPD (see go/use-adjective-apis),
its deps repo ndk needs to be relocated, as well as hooked by the root
DEPS instead of recursedeps. This CL addes android ndk deps in
libyuv/DEPS.
Bug: chromium:659808
Change-Id: I3d83c06d108d131ea1809c79955fae39d6cc737d
Reviewed-on: https://chromium-review.googlesource.com/858433
Reviewed-by: Frank Barchard <fbarchard@chromium.org>
Commit-Queue: Frank Barchard <fbarchard@chromium.org>
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | docs/deprecated_builds.md | 4 | ||||
| -rw-r--r-- | docs/getting_started.md | 6 |
3 files changed, 9 insertions, 5 deletions
@@ -56,6 +56,10 @@ deps = { 'url': Var('chromium_git') + '/chromium/src/base' + '@' + '9b543d487c7c38be191c6180001ff9ce186ae326', 'condition': 'checkout_android', }, + 'src/third_party/android_ndk': { + 'url': Var('chromium_git') + '/android_ndk.git' + '@' + 'e951c37287c7d8cd915bf8d4149fd4a06d808b55', + 'condition': 'checkout_android', + }, 'src/third_party/android_tools': { 'url': Var('chromium_git') + '/android_tools.git' + '@' + 'aadb2fed04af8606545b0afe4e3060bc1a15fad7', 'condition': 'checkout_android', diff --git a/docs/deprecated_builds.md b/docs/deprecated_builds.md index d54a0282..29e0bf9b 100644 --- a/docs/deprecated_builds.md +++ b/docs/deprecated_builds.md @@ -165,11 +165,11 @@ mipsel arm32 disassembly: - third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-objdump -d out/Release/obj/source/libyuv.row_neon.o + third_party/android_ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-objdump -d out/Release/obj/source/libyuv.row_neon.o arm64 disassembly: - third_party/android_tools/ndk/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-objdump -d out/Release/obj/source/libyuv.row_neon64.o + third_party/android_ndk/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-objdump -d out/Release/obj/source/libyuv.row_neon64.o Running tests: diff --git a/docs/getting_started.md b/docs/getting_started.md index fefffce4..09297b66 100644 --- a/docs/getting_started.md +++ b/docs/getting_started.md @@ -138,11 +138,11 @@ mips arm disassembly: - third_party/android_tools/ndk/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-objdump -d ./out/Release/obj/libyuv/row_common.o >row_common.txt + third_party/android_ndk/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-objdump -d ./out/Release/obj/libyuv/row_common.o >row_common.txt - third_party/android_tools/ndk/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-objdump -d ./out/Release/obj/libyuv_neon/row_neon.o >row_neon.txt + third_party/android_ndk/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-objdump -d ./out/Release/obj/libyuv_neon/row_neon.o >row_neon.txt - third_party/android_tools/ndk/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-objdump -d ./out/Release/obj/libyuv_neon/row_neon64.o >row_neon64.txt + third_party/android_ndk/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-objdump -d ./out/Release/obj/libyuv_neon/row_neon64.o >row_neon64.txt Running tests: |