From 5e7d13a0d215d8521e19a213ebc1086043ba1fc2 Mon Sep 17 00:00:00 2001
From: Chenglu Lin <chenglulin@google.com>
Date: Fri, 16 Jul 2021 16:41:12 +0800
Subject: [PATCH] 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         | 3 ---
 factory_common.mk | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/device.mk b/device.mk
index 032bfb3f..a550e95f 100644
--- a/device.mk
+++ b/device.mk
@@ -559,9 +559,6 @@ ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS)))
 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 \
diff --git a/factory_common.mk b/factory_common.mk
index 089d9a17..342ae460 100644
--- a/factory_common.mk
+++ b/factory_common.mk
@@ -75,3 +75,7 @@ PRODUCT_SET_DEBUGFS_RESTRICTIONS := false
 # PixelLogger for RF testing
 PRODUCT_PACKAGES_DEBUG += \
     PixelLogger
+
+# Tool for installing Widevine keybox
+PRODUCT_PACKAGES_DEBUG += \
+    WvInstallKeybox