Revert "Default undefined PRODUCT_SHIPPING_API_LEVEL to fake treble"

This reverts commit 8844f28a75.

Reason for revert: break build

Change-Id: I853d31465ac7953d2f9c3ee2b0d2ea85a0db621d
This commit is contained in:
Wei Wang 2018-10-30 20:27:30 +00:00
parent 8844f28a75
commit 9c91bbaa45

View file

@ -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