Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6da0113 authored by Anton Hansson's avatar Anton Hansson Committed by Android (Google) Code Review
Browse files

Merge changes from topic "enforce-pi-dev" into pi-dev 

* changes:
  Enforce specifying sdk/private for apps.
  Add more control to the java sdk enforcement.
parents 389bbe45 b88c0e04

core/sdk_check.mk

+29 −6
Original line number Diff line number Diff line
@@ -2,13 +2,36 @@ 
# Enforcement checks that LOCAL_SDK_VERSION and LOCAL_PRIVATE_PLATFORM_APIS are

# set correctly.

# Should be included by java targets that allow specifying LOCAL_SDK_VERSION.

# The JAVA_SDK_ENFORCEMENT_WARNING and JAVA_SDK_ENFORCEMENT_ERROR variables may

# be set to a particular module class to enable warnings and errors for that

# subtype.



whitelisted_modules := framework-res__auto_generated_rro





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.)

  ifeq (,$(filter $(LOCAL_MODULE),$(whitelisted_modules)))

    ifneq ($(JAVA_SDK_ENFORCEMENT_WARNING)$(JAVA_SDK_ENFORCEMENT_ERROR),)

      my_message := Must specify LOCAL_SDK_VERSION or LOCAL_PRIVATE_PLATFORM_APIS,

      ifeq ($(LOCAL_MODULE_CLASS),$(JAVA_SDK_ENFORCEMENT_ERROR))

        $(call pretty-error,$(my_message))

      endif

      ifeq ($(LOCAL_MODULE_CLASS),$(JAVA_SDK_ENFORCEMENT_WARNING))

        $(call pretty-warning,$(my_message))

      endif

      my_message :=

    endif

  endif

else ifneq ($(LOCAL_SDK_VERSION),)

  ifneq ($(LOCAL_PRIVATE_PLATFORM_APIS),)

$(error $(LOCAL_MODULE) specifies both LOCAL_SDK_VERSION ($(LOCAL_SDK_VERSION)) and LOCAL_PRIVATE_PLATFORM_APIS ($(LOCAL_PRIVATE_PLATFORM_APIS)), but should specify only one.)

    my_message := Specifies both LOCAL_SDK_VERSION ($(LOCAL_SDK_VERSION)) and

    my_message += LOCAL_PRIVATE_PLATFORM_APIS ($(LOCAL_PRIVATE_PLATFORM_APIS))

    my_message += but should specify only one

    $(call pretty-error,$(my_message))

    my_message :=

  endif

endif