From 9c91bbaa45298a982d1972f94b70ffd9bee1a821 Mon Sep 17 00:00:00 2001
From: Wei Wang <wvw@google.com>
Date: Tue, 30 Oct 2018 20:27:30 +0000
Subject: [PATCH] Revert "Default undefined PRODUCT_SHIPPING_API_LEVEL to fake
 treble"

This reverts commit 8844f28a75fc771f780843bf180c90616ec59a51.

Reason for revert: break build

Change-Id: I853d31465ac7953d2f9c3ee2b0d2ea85a0db621d
---
 treble_sepolicy_tests_for_release.mk | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/treble_sepolicy_tests_for_release.mk b/treble_sepolicy_tests_for_release.mk
index 7b5195ec1..e7c73c9b7 100644
--- a/treble_sepolicy_tests_for_release.mk
+++ b/treble_sepolicy_tests_for_release.mk
@@ -89,11 +89,7 @@ $(treble_sepolicy_tests_$(version)): PRIVATE_PLAT_SEPOLICY := $(built_plat_sepol
 $(treble_sepolicy_tests_$(version)): PRIVATE_PLAT_PUB_SEPOLICY := $(base_plat_pub_policy.cil)
 $(treble_sepolicy_tests_$(version)): PRIVATE_FAKE_TREBLE :=
 ifeq ($(PRODUCT_FULL_TREBLE_OVERRIDE),true)
-# TODO(b/113124961): undefined PRODUCT_SHIPPING_API_LEVEL should default to full
-# Treble. Change the behavior once the bug is fixed.
-ifndef PRODUCT_SHIPPING_API_LEVEL
-$(treble_sepolicy_tests_$(version)): PRIVATE_FAKE_TREBLE := --fake-treble
-else
+ifdef PRODUCT_SHIPPING_API_LEVEL
 # These requirements were originally added in Android Oreo. Devices
 # launching after this should not distinguish between
 # PRODUCT_FULL_TREBLE and PRODUCT_FULL_TREBLE_OVERRIDE since this could
-- 
GitLab