[sdk_subbuild] Build core instead of terminal
We built terminal for legacy reasons IIUC.
Bug: 38535
Change-Id: Id1985d701064d0fd9d4925e023e856c350865fcc
diff --git a/recipes/sdk_subbuild.expected/basic.json b/recipes/sdk_subbuild.expected/basic.json
index 7e30dd2..87a946c 100644
--- a/recipes/sdk_subbuild.expected/basic.json
+++ b/recipes/sdk_subbuild.expected/basic.json
@@ -224,7 +224,7 @@
"gen",
"[START_DIR]/fuchsia/out/default",
"--check",
- "--args=import(\"//products/terminal.gni\") base_package_labels+=[\"//topaz/packages/sdk:topaz\",\"//sdk/bundles:tools\"] build_sdk_archives=true goma_dir=\"[CACHE]/goma/client\" is_debug=false sdk_id=\"###SDK_ID###\" target_cpu=\"x64\" use_goma=true"
+ "--args=import(\"//products/core.gni\") base_package_labels+=[\"//topaz/packages/sdk:topaz\",\"//sdk/bundles:tools\"] build_sdk_archives=true goma_dir=\"[CACHE]/goma/client\" is_debug=false sdk_id=\"###SDK_ID###\" target_cpu=\"x64\" use_goma=true"
],
"cwd": "[START_DIR]/fuchsia",
"name": "build.build fuchsia.gn gen",
diff --git a/recipes/sdk_subbuild.expected/snapshot.json b/recipes/sdk_subbuild.expected/snapshot.json
index 3709349..8778870 100644
--- a/recipes/sdk_subbuild.expected/snapshot.json
+++ b/recipes/sdk_subbuild.expected/snapshot.json
@@ -306,7 +306,7 @@
"gen",
"[START_DIR]/fuchsia/out/default",
"--check",
- "--args=import(\"//products/terminal.gni\") base_package_labels+=[\"//topaz/packages/sdk:topaz\",\"//sdk/bundles:tools\"] build_info_product=\"terminal\" build_sdk_archives=true goma_dir=\"[CACHE]/goma/client\" is_debug=false sdk_id=\"###SDK_ID###\" target_cpu=\"x64\" use_goma=true"
+ "--args=import(\"//products/core.gni\") base_package_labels+=[\"//topaz/packages/sdk:topaz\",\"//sdk/bundles:tools\"] build_info_product=\"core\" build_sdk_archives=true goma_dir=\"[CACHE]/goma/client\" is_debug=false sdk_id=\"###SDK_ID###\" target_cpu=\"x64\" use_goma=true"
],
"cwd": "[START_DIR]/fuchsia",
"name": "build.build fuchsia.gn gen",
diff --git a/recipes/sdk_subbuild.expected/snapshot_cq.json b/recipes/sdk_subbuild.expected/snapshot_cq.json
index c1009e8..0a36546 100644
--- a/recipes/sdk_subbuild.expected/snapshot_cq.json
+++ b/recipes/sdk_subbuild.expected/snapshot_cq.json
@@ -404,7 +404,7 @@
"gen",
"[START_DIR]/fuchsia/out/default",
"--check",
- "--args=import(\"//products/terminal.gni\") base_package_labels+=[\"//topaz/packages/sdk:topaz\",\"//sdk/bundles:tools\"] build_info_product=\"terminal\" build_sdk_archives=true goma_dir=\"[CACHE]/goma/client\" is_debug=false sdk_id=\"###SDK_ID###\" target_cpu=\"x64\" use_goma=true"
+ "--args=import(\"//products/core.gni\") base_package_labels+=[\"//topaz/packages/sdk:topaz\",\"//sdk/bundles:tools\"] build_info_product=\"core\" build_sdk_archives=true goma_dir=\"[CACHE]/goma/client\" is_debug=false sdk_id=\"###SDK_ID###\" target_cpu=\"x64\" use_goma=true"
],
"cwd": "[START_DIR]/fuchsia",
"name": "build.build fuchsia.gn gen",
diff --git a/recipes/sdk_subbuild.py b/recipes/sdk_subbuild.py
index 399f30e..69b221c 100644
--- a/recipes/sdk_subbuild.py
+++ b/recipes/sdk_subbuild.py
@@ -68,8 +68,7 @@
if api.buildbucket_util.is_tryjob:
assert len(build.input.gerrit_changes) == 1
checkout = api.checkout.from_patchset_snapshot(
- path=checkout_root,
- gerrit_change=build.input.gerrit_changes[0])
+ path=checkout_root, gerrit_change=build.input.gerrit_changes[0])
else:
checkout = api.checkout.from_commit_snapshot(
path=checkout_root, gitiles_commit=build.input.gitiles_commit)
@@ -90,7 +89,7 @@
checkout=checkout,
target=target,
build_type='release',
- product='products/terminal.gni',
+ product='products/core.gni',
# TODO(DX-1415): move SDK tools back to universe_packages.
packages=packages + ['//sdk/bundles:tools'],
gn_args=['build_sdk_archives=true',
