From 49b67af95e1606d31b3f44d1d8e948cc88d50b8c Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Wed, 7 Mar 2018 11:30:16 +0000 Subject: [PATCH] Enforce specifying sdk/private for apps. All apps in master comply with this now, but new offenders are being added daily. This will ensure compliance going forward. Test: vendor/google/build/build_test.bash --dist Bug: 73535841 Exempt-From-Owner-Approval: reviewed in master/aosp, but this blocks aosp Change-Id: Id3fbb502d26d91b64480fec74e241ba77fa0faff Merged-In: Id3fbb502d26d91b64480fec74e241ba77fa0faff --- core/sdk_check.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/sdk_check.mk b/core/sdk_check.mk index c5c2bc8b7d..a34f83c35d 100644 --- a/core/sdk_check.mk +++ b/core/sdk_check.mk @@ -3,6 +3,11 @@ # 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.)