Revert "Remove unused SDK packages"
This reverts commit 1c46a34883591ed5a0cfbf44b90c1426324a9ee3.
Reason for revert: can't build image from this SDK
Change-Id: Iac8a3a35ee482440553bf6f57354a11d846b6023
Reviewed-on: https://cos-review.googlesource.com/c/third_party/overlays/chromiumos-overlay/+/66711
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Robert Kolchmeyer <rkolchmeyer@google.com>
diff --git a/virtual/target-chromium-os-sdk/target-chromium-os-sdk-1-r303.ebuild b/virtual/target-chromium-os-sdk/target-chromium-os-sdk-1-r302.ebuild
similarity index 80%
rename from virtual/target-chromium-os-sdk/target-chromium-os-sdk-1-r303.ebuild
rename to virtual/target-chromium-os-sdk/target-chromium-os-sdk-1-r302.ebuild
index 28739c0..b9f6fcd 100644
--- a/virtual/target-chromium-os-sdk/target-chromium-os-sdk-1-r303.ebuild
+++ b/virtual/target-chromium-os-sdk/target-chromium-os-sdk-1-r302.ebuild
@@ -110,17 +110,17 @@
sys-fs/mtd-utils
"
-# # Needed to build Android/ARC userland code.
-# RDEPEND+="
-# app-misc/jq
-# chromeos-base/mk-payload
-# sys-devel/aapt
-# sys-devel/arc-toolchain-master
-# sys-devel/arc-toolchain-p
-# sys-devel/arc-toolchain-r
-# sys-devel/arc-toolchain-t
-# sys-devel/dex2oatds
-# "
+# Needed to build Android/ARC userland code.
+RDEPEND+="
+ app-misc/jq
+ chromeos-base/mk-payload
+ sys-devel/aapt
+ sys-devel/arc-toolchain-master
+ sys-devel/arc-toolchain-p
+ sys-devel/arc-toolchain-r
+ sys-devel/arc-toolchain-t
+ sys-devel/dex2oatds
+ "
# Needed to run 'repo selfupdate'
RDEPEND+="
@@ -258,11 +258,11 @@
dev-util/bazel:5
"
-# # Various fonts are needed in order to generate messages for the
-# # chromeos-initramfs package.
-# RDEPEND+="
-# chromeos-base/chromeos-fonts
-# "
+# Various fonts are needed in order to generate messages for the
+# chromeos-initramfs package.
+RDEPEND+="
+ chromeos-base/chromeos-fonts
+ "
# Host dependencies that create usernames/groups we need to pull over to target.
RDEPEND+="
@@ -387,10 +387,10 @@
dev-util/bpftool
"
-# # Host dependencies for converting sparse into raw images (simg2img).
-# RDEPEND+="
-# brillo-base/libsparse
-# "
+# Host dependencies for converting sparse into raw images (simg2img).
+RDEPEND+="
+ brillo-base/libsparse
+ "
# Host dependencies for building Chromium code (libmojo)
RDEPEND+="
@@ -403,28 +403,28 @@
!net-misc/dhcpcd
"
-# # Host dependencies for building/testing factory software
-# RDEPEND+="
-# dev-libs/closure-library
-# dev-libs/closure_linter
-# dev-python/crcmod
-# dev-python/django
-# dev-python/jsonrpclib
-# dev-python/jsonschema
-# dev-python/pycryptodome
-# dev-python/python-gnupg
-# dev-python/requests
-# dev-python/sphinx
-# dev-python/twisted
-# !dev-python/twisted-core
-# !dev-python/twisted-web
-# www-servers/nginx
-# "
+# Host dependencies for building/testing factory software
+RDEPEND+="
+ dev-libs/closure-library
+ dev-libs/closure_linter
+ dev-python/crcmod
+ dev-python/django
+ dev-python/jsonrpclib
+ dev-python/jsonschema
+ dev-python/pycryptodome
+ dev-python/python-gnupg
+ dev-python/requests
+ dev-python/sphinx
+ dev-python/twisted
+ !dev-python/twisted-core
+ !dev-python/twisted-web
+ www-servers/nginx
+ "
-# # Host dependencies for building harfbuzz
-# RDEPEND+="
-# dev-util/ragel
-# "
+# Host dependencies for building harfbuzz
+RDEPEND+="
+ dev-util/ragel
+ "
# Host dependencies for building chromeos-bootimage
RDEPEND+="
@@ -436,14 +436,14 @@
chromeos-base/ec-utils
"
-# # Host dependencies for the AP/EC/GSC firmware release testing workflow
-# RDEPEND+="
-# sys-firmware/fw-engprod-tools
-# "
+# Host dependencies for the AP/EC/GSC firmware release testing workflow
+RDEPEND+="
+ sys-firmware/fw-engprod-tools
+ "
-# # Host dependencies for audio topology generation
-# RDEPEND+="
-# media-sound/alsa-utils"
+# Host dependencies for audio topology generation
+RDEPEND+="
+ media-sound/alsa-utils"
# Host dependency for managing SELinux
# XXX(rkolchmeyer): selinux-python pulls in matplotlib, which doesn't compile
@@ -455,17 +455,17 @@
# sys-apps/secilc
# sys-apps/selinux-python"
-# # Host dependencies that are needed for chromite/bin/cros_generate_android_breakpad_symbols
-# RDEPEND+="
-# chromeos-base/android-relocation-packer"
+# Host dependencies that are needed for chromite/bin/cros_generate_android_breakpad_symbols
+RDEPEND+="
+ chromeos-base/android-relocation-packer"
# Host dependencies for generating and testing update payloads
RDEPEND+="
chromeos-base/update_payload"
-# # Needed to compile moblab mobmonitor ui
-# RDEPEND+="
-# net-libs/nodejs"
+# Needed to compile moblab mobmonitor ui
+RDEPEND+="
+ net-libs/nodejs"
# Needed to compile img-ddk
RDEPEND+="
@@ -480,22 +480,22 @@
RDEPEND+="
sys-power/cpupower"
-# # Base layout for java that installs cacerts
-# RDEPEND+="
-# sys-apps/baselayout-java"
+# Base layout for java that installs cacerts
+RDEPEND+="
+ sys-apps/baselayout-java"
-# # CTS P depends on Java 8 or 9, CTS R depends on Java 9 or later.
-# # Include android-sdk to contain both JDK8 and JDK11 in the chroot.
-# RDEPEND+="
-# chromeos-base/android-sdk"
+# CTS P depends on Java 8 or 9, CTS R depends on Java 9 or later.
+# Include android-sdk to contain both JDK8 and JDK11 in the chroot.
+RDEPEND+="
+ chromeos-base/android-sdk"
-# # Needed to optimise Android APKs shipped in demo_mode_resources.
-# RDEPEND+="
-# sys-devel/zipalign"
+# Needed to optimise Android APKs shipped in demo_mode_resources.
+RDEPEND+="
+ sys-devel/zipalign"
-# # Needed to build IPA interface in libcamera.
-# RDEPEND+="
-# dev-python/jinja"
+# Needed to build IPA interface in libcamera.
+RDEPEND+="
+ dev-python/jinja"
# Needed for packages that need older 4.9.2 GCC.
RDEPEND+="
@@ -528,17 +528,17 @@
dev-python/pebble
dev-util/cvise"
-# # Needed for floss project.
-# RDEPEND+="
-# net-wireless/floss_tools"
+# Needed for floss project.
+RDEPEND+="
+ net-wireless/floss_tools"
-# # Needed to build net-fs/samba
-# RDEPEND+="
-# dev-perl/Parse-Yapp"
+# Needed to build net-fs/samba
+RDEPEND+="
+ dev-perl/Parse-Yapp"
-# # Needed to build cros-camera-hal-qti.
-# RDEPEND+="
-# dev-perl/XML-Simple"
+# Needed to build cros-camera-hal-qti.
+RDEPEND+="
+ dev-perl/XML-Simple"
# Needed for vkbench.
RDEPEND+="
@@ -566,21 +566,21 @@
RDEPEND+="
dev-python/dataclasses"
-# # Needed for app-metrics/node_exporter.
-# RDEPEND+="
-# dev-util/promu"
+# Needed for app-metrics/node_exporter.
+RDEPEND+="
+ dev-util/promu"
-# # Needed for fwupd-efi>=1.4.
-# RDEPEND+="
-# dev-python/pefile"
+# Needed for fwupd-efi>=1.4.
+RDEPEND+="
+ dev-python/pefile"
-# # Needed for x11-libs/libxcb.
-# RDEPEND+=" x11-base/xcb-proto"
+# Needed for x11-libs/libxcb.
+RDEPEND+=" x11-base/xcb-proto"
# Needed for dev-libs/boost.
RDEPEND+=" dev-util/b2"
-# # Needed for chromite telemetry
-# RDEPEND+="
-# dev-python/opentelemetry-api
-# dev-python/opentelemetry-sdk"
+# Needed for chromite telemetry
+RDEPEND+="
+ dev-python/opentelemetry-api
+ dev-python/opentelemetry-sdk"
