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

Commit 255ddf64 authored by JaeMan Park's avatar JaeMan Park Committed by Automerger Merge Worker
Browse files

Merge "Add java_sdk_library enforcement flag verification" am: c21cde10 am:... 

Merge "Add java_sdk_library enforcement flag verification" am: c21cde10 am: 24efe302 am: 3c3b051f

Original change: https://android-review.googlesource.com/c/platform/build/+/1519538

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d7f20ad8bf601b5850a6f8f8aa187f26b336530
parents d6f4d46c 3c3b051f

core/board_config.mk

+10 −0
Original line number Diff line number Diff line
@@ -721,6 +721,16 @@ else 
  TARGET_VENDOR_TEST_SUFFIX :=

endif



# If PRODUCT_ENFORCE_INTER_PARTITION_JAVA_SDK_LIBRARY is set,

# BOARD_VNDK_VERSION must be set because PRODUCT_ENFORCE_INTER_PARTITION_JAVA_SDK_LIBRARY

# is a enforcement of inter-partition dependency, and it doesn't have any meaning

# when BOARD_VNDK_VERSION isn't set.

ifeq ($(PRODUCT_ENFORCE_INTER_PARTITION_JAVA_SDK_LIBRARY),true)

  ifeq ($(BOARD_VNDK_VERSION),)

    $(error BOARD_VNDK_VERSION must be set when PRODUCT_ENFORCE_INTER_PARTITION_JAVA_SDK_LIBRARY is true)

  endif

endif



###########################################

# APEXes are by default flattened, i.e. non-updatable.

# It can be unflattened (and updatable) by inheriting from