commit 5e7d13a0d215d8521e19a213ebc1086043ba1fc2
author Chenglu Lin <chenglulin@google.com> Fri Jul 16 16:41:12 2021 +0800
committer TreeHugger Robot <treehugger-gerrit@google.com> Mon Jul 19 13:21:57 2021 +0000
tree 9c715c8c03297bc4759cb2d71e84762439c0ec83
parent f45c7d1cb591ed281da0c19698c9747b29c91cdf

Move WvInstallKeybox to factory build only

Test: build factory_oriole-userdebug
Test: build factory_raven-userdebug
Test: build oriole-userdebug
Test: build raven-userdebug
Bug: 193532508
Change-Id: Iaa1c60e9878250923069a0711097eede16dbb082

device.mk

diff --git a/device.mk b/device.mk
index 032bfb3..a550e95 100644
--- a/device.mk
+++ b/device.mk
@@ -559,9 +559,6 @@
 include hardware/google/pixel/dauntless/dauntless.mk
 endif
 
-PRODUCT_PACKAGES_DEBUG += \
-	WvInstallKeybox
-
 # Copy Camera HFD Setfiles
 #PRODUCT_COPY_FILES += \
 	device/google/gs101/firmware/camera/libhfd/default_configuration.hfd.cfg.json:$(TARGET_COPY_OUT_VENDOR)/firmware/default_configuration.hfd.cfg.json \

factory_common.mk

diff --git a/factory_common.mk b/factory_common.mk
index 089d9a1..342ae46 100644
--- a/factory_common.mk
+++ b/factory_common.mk
@@ -75,3 +75,7 @@
 # PixelLogger for RF testing
 PRODUCT_PACKAGES_DEBUG += \
     PixelLogger
+
+# Tool for installing Widevine keybox
+PRODUCT_PACKAGES_DEBUG += \
+    WvInstallKeybox