From 7b04d3701663ac2f3a5a16833e0ec283a07435f1 Mon Sep 17 00:00:00 2001
From: Manuel Martin <imanol.martin@gmail.com>
Date: Thu, 8 Oct 2020 23:26:39 +0200
Subject: [PATCH] Disable building Oculus 3dof in TC (#3894)

---
 tools/taskcluster/build_targets.py |  5 ++---
 tools/taskcluster/sign_apk.py      | 10 ----------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/tools/taskcluster/build_targets.py b/tools/taskcluster/build_targets.py
index 296d7d421..f387d8ff9 100644
--- a/tools/taskcluster/build_targets.py
+++ b/tools/taskcluster/build_targets.py
@@ -12,7 +12,7 @@
 This is the default behaviour with no options. Only the Release build of each
 architecture for each supported platform is built:
 $ python build_targets.py 1.1.4a
-assembleNoapiArm64Release assembleNoapiX86_64Release assembleOculusvrArm64Release assembleWavevrstoreArm64Release assemblePicovrArm64Release assemblePicovrStoreArm64Release assembleOculusvrstoreArm64Release assembleWavevrArm64Release assembleOculusvr3dofstoreArm64Release
+assembleNoapiArm64Release assembleNoapiX86_64Release assembleOculusvrArm64Release assembleWavevrstoreArm64Release assemblePicovrArm64Release assemblePicovrStoreArm64Release assembleOculusvrstoreArm64Release assembleWavevrArm64Release
 
 Specifies only build the OculusVR platform:
 $ python build_targets.py 1.1.4b+oculusvr
@@ -20,7 +20,7 @@
 
 Specifies all build types including Release and Debug:
 $ python build_targets.py 1.1.4c=all
-assembleNoapiArm64 assembleNoapiX86_64 assembleOculusvrArm64 assembleWavevrstoreArm64 assemblePicovrArm64 assemblePicovrStoreArm64 assembleOculusvrstoreArm64 assembleWavevrArm64 assembleOculusvr3dofstoreArm64
+assembleNoapiArm64 assembleNoapiX86_64 assembleOculusvrArm64 assembleWavevrstoreArm64 assemblePicovrArm64 assemblePicovrStoreArm64 assembleOculusvrstoreArm64 assembleWavevrArm64
 
 Specifies Release builds of Arm64 OculusVR, Arm64 WaveVR, and x86_64 NoAPI:
 $ python build_targets.py 1.1.4d+oculusvr+wavevr+noapi=x86_64
@@ -35,7 +35,6 @@
 platforms = {
    'oculusvr': ['arm64'],
    'oculusvrStore': ['arm64'],
-   'oculusvr3dofStore': ['arm64'],
    'wavevr': ['arm64'],
    'wavevrStore': ['arm64'],
    'picovr': ['arm64'],
diff --git a/tools/taskcluster/sign_apk.py b/tools/taskcluster/sign_apk.py
index 8182dd243..a41e647c7 100644
--- a/tools/taskcluster/sign_apk.py
+++ b/tools/taskcluster/sign_apk.py
@@ -12,10 +12,6 @@
 import sys
 import time
 
-v1_platforms = {
-   'oculusvr3dofstore',
-}
-
 def main(name, argv):
    token = ''
    v1_token = ''
@@ -62,12 +58,6 @@ def main(name, argv):
 
       if not release:
          target = target.replace('-release-', '-staging-' + feature_name)
-      else:
-         for platform in v1_platforms:
-            if platform in target.lower():
-               print "Using v1 signing on target:", target
-               cred = v1_token
-               align = True
 
       print "Signing", apk
       print "Target ", target