commit 455f2c02232be0cc6a2c43da01a01af59d543570
author Anton Hansson <hansson@google.com> Thu Mar 08 16:39:22 2018 +0000
committer Anton Hansson <hansson@google.com> Thu Mar 08 16:41:05 2018 +0000
tree 91762108919e5da94567a70abb133bbd28b99453
parent 49b67af95e1606d31b3f44d1d8e948cc88d50b8c

Revert "Enforce specifying sdk/private for apps."

This reverts commit 49b67af95e1606d31b3f44d1d8e948cc88d50b8c.

Reason for revert: Missing a bunch of fixes from master.

Test: make
Bug: 73535841
Exempt-From-Owner-Approval: fixes the build
Change-Id: Ide0998bad5876aa409d1bb0f8331e6b097c3c8a2
Merged-In: Id3fbb502d26d91b64480fec74e241ba77fa0faff

core/sdk_check.mk

diff --git a/core/sdk_check.mk b/core/sdk_check.mk
index a34f83c..c5c2bc8 100644
--- a/core/sdk_check.mk
+++ b/core/sdk_check.mk
@@ -3,11 +3,6 @@
 # set correctly.
 # Should be included by java targets that allow specifying LOCAL_SDK_VERSION.
 
-
-ifeq (,$(JAVA_SDK_ENFORCEMENT_ERROR))
-  JAVA_SDK_ENFORCEMENT_ERROR := APPS
-endif
-
 ifeq ($(LOCAL_SDK_VERSION)$(LOCAL_PRIVATE_PLATFORM_APIS),)
 ifneq ($(JAVA_SDK_ENFORCEMENT_WARNING),)
 $(warning Java modules must specify LOCAL_SDK_VERSION or LOCAL_PRIVATE_PLATFORM_APIS, but $(LOCAL_MODULE) specifies neither.)