commit f1a856e63dff26daf0cba4abc77b7b6ee80b2126
author Treehugger Robot <treehugger-gerrit@google.com> Thu Nov 01 00:55:55 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 01 00:55:55 2018 +0000
tree e162e318a6591289000af347394a5213e491fefc
parent b4afdea89241a672a8f27947e0fa3bdcbbc30b35
parent 9087b77517d76cf091e0130b44b4c7cf94625524

Merge "Reland "Default undefined PRODUCT_SHIPPING_API_LEVEL to fake treble""

treble_sepolicy_tests_for_release.mk

diff --git a/treble_sepolicy_tests_for_release.mk b/treble_sepolicy_tests_for_release.mk
index e7c73c9..7b5195e 100644
--- a/treble_sepolicy_tests_for_release.mk
+++ b/treble_sepolicy_tests_for_release.mk
@@ -89,7 +89,11 @@
 $(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)
-ifdef PRODUCT_SHIPPING_API_LEVEL
+# 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
 # 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