Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 11b2dd8

Browse files
committed
Merge pull request #112 from abarth/travis_experiment
Experiment with building Android on Travis
2 parents 1fcc507 + 5cfb81a commit 11b2dd8

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
language: dart
1+
language: cpp
22
sudo: required
33
before_install:
44
- ./travis/before_install.sh

sky/tools/gn

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def to_gn_args(args):
2929
gn_args = {}
3030

3131
gn_args["is_debug"] = args.debug
32-
gn_args["is_clang"] = args.target_os not in ['android']
32+
gn_args["is_clang"] = args.clang and args.target_os not in ['android']
3333

3434
if args.target_os == 'android':
3535
gn_args["target_os"] = "android"
@@ -79,6 +79,9 @@ def main():
7979
parser.add_argument('--goma', default=True, action='store_true')
8080
parser.add_argument('--no-goma', dest='goma', action='store_false')
8181

82+
parser.add_argument('--clang', default=True, action='store_true')
83+
parser.add_argument('--no-clang', dest='clang', action='store_false')
84+
8285
args = parser.parse_args()
8386

8487
command = ['gn', 'gen', '--check']

travis/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ set -ex
33

44
# Linux Debug
55
./sky/tools/gn --debug
6-
ninja -j 8 -C out/Debug
7-
./sky/tools/test_sky --debug
6+
ninja -j 2 -C out/Debug
7+
./sky/tools/test_sky --debug --child-processes=1

travis/gclient

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ solutions = [{
55
"managed" : False,
66
"safesync_url": "",
77
}]
8-
target_os = ['linux']
8+
target_os = ['linux', 'android']

0 commit comments

Comments
 (0)