Build 32- and 64-bit Android mojo_core for Chrome OS distribution
This is an unmodified reland of r554617 after fixing cases where
target_os=["chromeos"] was not set in some Chrome OS builders'
gclient configs.
Causes Chrome builds for Chrome OS to emit additional 32-bit and
64-bit copies of the mojo_core shared library built against the
Android toolchain, for use from within the ARC++ container.
In order to support building these library targets, this also
modifies DEPS to include a minimal set of required Android support
tools and libraries in chromeos checkouts.
Bug: 822034
Change-Id: I0e6ae87a1b9da80b82c40fd637a5be07dd7b8272
Reviewed-on: https://chromium-review.googlesource.com/1035619
Commit-Queue: Ken Rockot <[email protected]>
Reviewed-by: Dirk Pranke <[email protected]>
Cr-Commit-Position: refs/heads/master@{#554983}diff --git a/DEPS b/DEPS
index 83222e6..47fa632 100644
--- a/DEPS
+++ b/DEPS
@@ -29,6 +29,7 @@
gclient_gn_args_file = 'src/build/config/gclient_args.gni'
gclient_gn_args = [
'checkout_android',
+ 'checkout_android_native_support',
'checkout_libaom',
'checkout_nacl',
'checkout_oculus_sdk',
@@ -42,6 +43,10 @@
# purposes.
'checkout_configuration': 'default',
+ # Pull in Android native toolchain dependencies for Chrome OS too, so we can
+ # build ARC++ support libraries.
+ 'checkout_android_native_support': 'checkout_android or checkout_chromeos',
+
# By default, do not check out android sdk sources. This can be overridden
# e.g. with custom_vars.
'checkout_android_sdk_sources': False,
@@ -342,7 +347,7 @@
'src/third_party/android_ndk': {
'url': Var('chromium_git') + '/android_ndk.git' + '@' + '635bc380968a76f6948fee65f80a0b28db53ae81',
- 'condition': 'checkout_android',
+ 'condition': 'checkout_android_native_support',
},
'src/third_party/android_support_test_runner': {
@@ -369,7 +374,7 @@
'src/third_party/android_tools': {
'url': Var('chromium_git') + '/android_tools.git' + '@' + 'c22a664c39af72dd8f89200220713dcad811300a',
- 'condition': 'checkout_android',
+ 'condition': 'checkout_android_native_support',
},
'src/third_party/android_sdk/public': {
@@ -528,7 +533,7 @@
'src/third_party/elfutils/src': {
'url': Var('chromium_git') + '/external/elfutils.git' + '@' + '249673729a7e5dbd5de4f3760bdcaa3d23d154d7',
- 'condition': 'checkout_android',
+ 'condition': 'checkout_android_native_support',
},
'src/third_party/errorprone/lib': {
