[gn] Update path to package files.
TO-591
Change-Id: Id5509f3460329c1a24552b69046da196d504a4c4
diff --git a/README.md b/README.md
index 970ba1b..a32f244 100644
--- a/README.md
+++ b/README.md
@@ -225,7 +225,7 @@
`manifest` property.
2. If triggered by the commit queue, patches to the pending commit.
3. Runs `scripts/build-zircon.sh`.
-4. Runs `packages/gn/gen.py` with modules specified in the `modules` property.
+4. Runs `build/gn/gen.py` with modules specified in the `modules` property.
5. Builds Fuchsia using Ninja.
6. If the `tests` property is specified, runs the specified tests with
[Test Runner](https://fuchsia.googlesource.com/garnet/+/master/bin/test_runner)
diff --git a/recipes/fuchsia.expected/arm64_skip_tests.json b/recipes/fuchsia.expected/arm64_skip_tests.json
index 00ae42f..f556cba 100644
--- a/recipes/fuchsia.expected/arm64_skip_tests.json
+++ b/recipes/fuchsia.expected/arm64_skip_tests.json
@@ -231,7 +231,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=aarch64",
- "--packages=packages/gn/default",
+ "--packages=build/gn/default",
"--goma=[START_DIR]/cipd/goma"
],
"name": "build fuchsia.gen",
diff --git a/recipes/fuchsia.expected/autorun_backtrace.json b/recipes/fuchsia.expected/autorun_backtrace.json
index f7c3045..cd37dbc 100644
--- a/recipes/fuchsia.expected/autorun_backtrace.json
+++ b/recipes/fuchsia.expected/autorun_backtrace.json
@@ -283,7 +283,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/default",
+ "--packages=build/gn/default",
"--autorun=[TMP_BASE]/autorun",
"--goma=[START_DIR]/cipd/goma"
],
diff --git a/recipes/fuchsia.expected/autorun_failed_qemu.json b/recipes/fuchsia.expected/autorun_failed_qemu.json
index 439a0a6..c324b8d 100644
--- a/recipes/fuchsia.expected/autorun_failed_qemu.json
+++ b/recipes/fuchsia.expected/autorun_failed_qemu.json
@@ -283,7 +283,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/default",
+ "--packages=build/gn/default",
"--autorun=[TMP_BASE]/autorun",
"--goma=[START_DIR]/cipd/goma"
],
diff --git a/recipes/fuchsia.expected/autorun_failed_tests.json b/recipes/fuchsia.expected/autorun_failed_tests.json
index 6fc7a94..15838a8 100644
--- a/recipes/fuchsia.expected/autorun_failed_tests.json
+++ b/recipes/fuchsia.expected/autorun_failed_tests.json
@@ -283,7 +283,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/default",
+ "--packages=build/gn/default",
"--autorun=[TMP_BASE]/autorun",
"--goma=[START_DIR]/cipd/goma"
],
diff --git a/recipes/fuchsia.expected/autorun_no_results.json b/recipes/fuchsia.expected/autorun_no_results.json
index cde514e..3febf45 100644
--- a/recipes/fuchsia.expected/autorun_no_results.json
+++ b/recipes/fuchsia.expected/autorun_no_results.json
@@ -283,7 +283,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/default",
+ "--packages=build/gn/default",
"--autorun=[TMP_BASE]/autorun",
"--goma=[START_DIR]/cipd/goma"
],
diff --git a/recipes/fuchsia.expected/autorun_tests.json b/recipes/fuchsia.expected/autorun_tests.json
index 367daee..d0621ef 100644
--- a/recipes/fuchsia.expected/autorun_tests.json
+++ b/recipes/fuchsia.expected/autorun_tests.json
@@ -283,7 +283,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/default",
+ "--packages=build/gn/default",
"--autorun=[TMP_BASE]/autorun",
"--goma=[START_DIR]/cipd/goma"
],
diff --git a/recipes/fuchsia.expected/autorun_tests_timeout.json b/recipes/fuchsia.expected/autorun_tests_timeout.json
index 9e3201a..f3eb1e6 100644
--- a/recipes/fuchsia.expected/autorun_tests_timeout.json
+++ b/recipes/fuchsia.expected/autorun_tests_timeout.json
@@ -283,7 +283,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/default",
+ "--packages=build/gn/default",
"--autorun=[TMP_BASE]/autorun",
"--goma=[START_DIR]/cipd/goma"
],
diff --git a/recipes/fuchsia.expected/backtrace.json b/recipes/fuchsia.expected/backtrace.json
index ac150e7..1020a8b 100644
--- a/recipes/fuchsia.expected/backtrace.json
+++ b/recipes/fuchsia.expected/backtrace.json
@@ -263,7 +263,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/default,packages/gn/boot_test_runner",
+ "--packages=build/gn/default,build/gn/boot_test_runner",
"--goma=[START_DIR]/cipd/goma"
],
"name": "build fuchsia.gen",
diff --git a/recipes/fuchsia.expected/cq.json b/recipes/fuchsia.expected/cq.json
index c9cf54d..286b794 100644
--- a/recipes/fuchsia.expected/cq.json
+++ b/recipes/fuchsia.expected/cq.json
@@ -216,7 +216,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/default",
+ "--packages=build/gn/default",
"--goma=[START_DIR]/cipd/goma"
],
"name": "build fuchsia.gen",
diff --git a/recipes/fuchsia.expected/default.json b/recipes/fuchsia.expected/default.json
index 445e37d..7d01558 100644
--- a/recipes/fuchsia.expected/default.json
+++ b/recipes/fuchsia.expected/default.json
@@ -231,7 +231,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/default",
+ "--packages=build/gn/default",
"--goma=[START_DIR]/cipd/goma"
],
"name": "build fuchsia.gen",
diff --git a/recipes/fuchsia.expected/failed_tests.json b/recipes/fuchsia.expected/failed_tests.json
index acc2a24..c10ecbf 100644
--- a/recipes/fuchsia.expected/failed_tests.json
+++ b/recipes/fuchsia.expected/failed_tests.json
@@ -263,7 +263,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/default,packages/gn/boot_test_runner",
+ "--packages=build/gn/default,build/gn/boot_test_runner",
"--goma=[START_DIR]/cipd/goma"
],
"name": "build fuchsia.gen",
diff --git a/recipes/fuchsia.expected/garnet.json b/recipes/fuchsia.expected/garnet.json
index ea38751..bc672d2 100644
--- a/recipes/fuchsia.expected/garnet.json
+++ b/recipes/fuchsia.expected/garnet.json
@@ -233,7 +233,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/default",
+ "--packages=build/gn/default",
"--goma=[START_DIR]/cipd/goma"
],
"name": "build fuchsia.gen",
diff --git a/recipes/fuchsia.expected/gn_args.json b/recipes/fuchsia.expected/gn_args.json
index f09b6e7..cd04497 100644
--- a/recipes/fuchsia.expected/gn_args.json
+++ b/recipes/fuchsia.expected/gn_args.json
@@ -216,7 +216,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/default",
+ "--packages=build/gn/default",
"--goma=[START_DIR]/cipd/goma",
"--args",
"super_arg=false",
diff --git a/recipes/fuchsia.expected/goma_local_cache.json b/recipes/fuchsia.expected/goma_local_cache.json
index e8a3ba1..b3559db 100644
--- a/recipes/fuchsia.expected/goma_local_cache.json
+++ b/recipes/fuchsia.expected/goma_local_cache.json
@@ -232,7 +232,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/default",
+ "--packages=build/gn/default",
"--goma=[START_DIR]/cipd/goma"
],
"name": "build fuchsia.gen",
diff --git a/recipes/fuchsia.expected/isolated_tests.json b/recipes/fuchsia.expected/isolated_tests.json
index 6a3eced..d9f2afb 100644
--- a/recipes/fuchsia.expected/isolated_tests.json
+++ b/recipes/fuchsia.expected/isolated_tests.json
@@ -316,7 +316,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/default",
+ "--packages=build/gn/default",
"--autorun=[TMP_BASE]/autorun",
"--goma=[START_DIR]/cipd/goma"
],
diff --git a/recipes/fuchsia.expected/isolated_tests_infra_failure.json b/recipes/fuchsia.expected/isolated_tests_infra_failure.json
index 7a5f54b..d5d3710 100644
--- a/recipes/fuchsia.expected/isolated_tests_infra_failure.json
+++ b/recipes/fuchsia.expected/isolated_tests_infra_failure.json
@@ -316,7 +316,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/default",
+ "--packages=build/gn/default",
"--autorun=[TMP_BASE]/autorun",
"--goma=[START_DIR]/cipd/goma"
],
diff --git a/recipes/fuchsia.expected/isolated_tests_task_failure.json b/recipes/fuchsia.expected/isolated_tests_task_failure.json
index a9c81e4..acf1400 100644
--- a/recipes/fuchsia.expected/isolated_tests_task_failure.json
+++ b/recipes/fuchsia.expected/isolated_tests_task_failure.json
@@ -316,7 +316,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/default",
+ "--packages=build/gn/default",
"--autorun=[TMP_BASE]/autorun",
"--goma=[START_DIR]/cipd/goma"
],
diff --git a/recipes/fuchsia.expected/lto.json b/recipes/fuchsia.expected/lto.json
index 777b4c2..152ab67 100644
--- a/recipes/fuchsia.expected/lto.json
+++ b/recipes/fuchsia.expected/lto.json
@@ -231,7 +231,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/default",
+ "--packages=build/gn/default",
"--goma=[START_DIR]/cipd/goma",
"--release",
"--lto=full"
diff --git a/recipes/fuchsia.expected/manifest.json b/recipes/fuchsia.expected/manifest.json
index 25562b2..9cd8108 100644
--- a/recipes/fuchsia.expected/manifest.json
+++ b/recipes/fuchsia.expected/manifest.json
@@ -216,7 +216,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/default",
+ "--packages=build/gn/default",
"--goma=[START_DIR]/cipd/goma"
],
"name": "build fuchsia.gen",
diff --git a/recipes/fuchsia.expected/no_goma.json b/recipes/fuchsia.expected/no_goma.json
index d5810a8..79086af 100644
--- a/recipes/fuchsia.expected/no_goma.json
+++ b/recipes/fuchsia.expected/no_goma.json
@@ -198,7 +198,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/default",
+ "--packages=build/gn/default",
"--goma=/path/to/goma"
],
"name": "build fuchsia.gen",
diff --git a/recipes/fuchsia.expected/peridot.json b/recipes/fuchsia.expected/peridot.json
index 8bdb946..350442a 100644
--- a/recipes/fuchsia.expected/peridot.json
+++ b/recipes/fuchsia.expected/peridot.json
@@ -258,7 +258,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/default",
+ "--packages=build/gn/default",
"--goma=[START_DIR]/cipd/goma"
],
"name": "build fuchsia.gen",
diff --git a/recipes/fuchsia.expected/release.json b/recipes/fuchsia.expected/release.json
index 0bb3e05..730b9f7 100644
--- a/recipes/fuchsia.expected/release.json
+++ b/recipes/fuchsia.expected/release.json
@@ -231,7 +231,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/default",
+ "--packages=build/gn/default",
"--goma=[START_DIR]/cipd/goma",
"--release"
],
diff --git a/recipes/fuchsia.expected/tests.json b/recipes/fuchsia.expected/tests.json
index fb34cbe..6f7e7cc 100644
--- a/recipes/fuchsia.expected/tests.json
+++ b/recipes/fuchsia.expected/tests.json
@@ -263,7 +263,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/default,packages/gn/boot_test_runner",
+ "--packages=build/gn/default,build/gn/boot_test_runner",
"--goma=[START_DIR]/cipd/goma"
],
"name": "build fuchsia.gen",
diff --git a/recipes/fuchsia.expected/thinlto.json b/recipes/fuchsia.expected/thinlto.json
index 957d891..7cab4cc 100644
--- a/recipes/fuchsia.expected/thinlto.json
+++ b/recipes/fuchsia.expected/thinlto.json
@@ -231,7 +231,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/default",
+ "--packages=build/gn/default",
"--goma=[START_DIR]/cipd/goma",
"--release",
"--lto=thin",
diff --git a/recipes/fuchsia.py b/recipes/fuchsia.py
index f7b8a10..03836af 100644
--- a/recipes/fuchsia.py
+++ b/recipes/fuchsia.py
@@ -58,7 +58,7 @@
'build_type': Property(kind=Enum('debug', 'release', 'thinlto', 'lto'),
help='The build type', default='debug'),
'modules': Property(kind=List(basestring), help='Packages to build',
- default=['packages/gn/default']),
+ default=['build/gn/default']),
'tests': Property(kind=str,
help='Path to config file listing tests to run, or (when using autorun) command to run tests',
default=None),
@@ -118,7 +118,7 @@
api.file.write_text('write autorun', autorun_path, '\n'.join(autorun))
api.step.active_result.presentation.logs['autorun.sh'] = autorun
else:
- modules.append('packages/gn/boot_test_runner')
+ modules.append('build/gn/boot_test_runner')
goma_env = {}
if api.properties.get('goma_local_cache', False):
diff --git a/recipes/sdk.expected/ci.json b/recipes/sdk.expected/ci.json
index 18d78ef..0902188 100644
--- a/recipes/sdk.expected/ci.json
+++ b/recipes/sdk.expected/ci.json
@@ -228,7 +228,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/sdk",
+ "--packages=build/gn/sdk",
"--ignore-skia",
"--goma=[START_DIR]/cipd/goma",
"--release",
@@ -359,7 +359,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=aarch64",
- "--packages=packages/gn/sdk",
+ "--packages=build/gn/sdk",
"--ignore-skia",
"--goma=[START_DIR]/cipd/goma",
"--release",
diff --git a/recipes/sdk.expected/cq_try.json b/recipes/sdk.expected/cq_try.json
index 23a5364..c6fa38a 100644
--- a/recipes/sdk.expected/cq_try.json
+++ b/recipes/sdk.expected/cq_try.json
@@ -240,7 +240,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/sdk",
+ "--packages=build/gn/sdk",
"--ignore-skia",
"--goma=[START_DIR]/cipd/goma",
"--release"
@@ -369,7 +369,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=aarch64",
- "--packages=packages/gn/sdk",
+ "--packages=build/gn/sdk",
"--ignore-skia",
"--goma=[START_DIR]/cipd/goma",
"--release"
diff --git a/recipes/sdk.expected/no_goma.json b/recipes/sdk.expected/no_goma.json
index 6477450..6549cef 100644
--- a/recipes/sdk.expected/no_goma.json
+++ b/recipes/sdk.expected/no_goma.json
@@ -178,7 +178,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=x86-64",
- "--packages=packages/gn/sdk",
+ "--packages=build/gn/sdk",
"--ignore-skia",
"--release"
],
@@ -208,7 +208,7 @@
"cmd": [
"[START_DIR]/build/gn/gen.py",
"--target_cpu=aarch64",
- "--packages=packages/gn/sdk",
+ "--packages=build/gn/sdk",
"--ignore-skia",
"--release"
],
diff --git a/recipes/sdk.py b/recipes/sdk.py
index d0d7d78..b90750c 100644
--- a/recipes/sdk.py
+++ b/recipes/sdk.py
@@ -175,7 +175,7 @@
with api.context(infra_steps=True):
api.jiri.checkout(manifest, remote, project, patch_ref, patch_gerrit_url)
- modules = ['packages/gn/sdk']
+ modules = ['build/gn/sdk']
build_type = 'release'
release_build = True
gn_targets = ['x86-64', 'aarch64']
