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

Commit 7dbc8e08 authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge "LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK" 

am: 3952eef8

Change-Id: I651ac922ea336c79880a3727cab621bb7167d20d
parents dcad0945 3952eef8

core/local_vndk.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ 
#If LOCAL_SDK_VERSION is set, thats a more restrictive set, so they dont need LOCAL_USE_VNDK

#If LOCAL_SDK_VERSION is set, thats a more restrictive set, so they dont need LOCAL_USE_VNDK

ifndef LOCAL_IS_HOST_MODULE

ifndef LOCAL_IS_HOST_MODULE

ifndef LOCAL_SDK_VERSION

ifndef LOCAL_SDK_VERSION

  ifneq (,$(filter true,$(LOCAL_VENDOR_MODULE) $(LOCAL_ODM_MODULE) $(LOCAL_OEM_MODULE)))

  ifneq (,$(filter true,$(LOCAL_VENDOR_MODULE) $(LOCAL_ODM_MODULE) $(LOCAL_OEM_MODULE) $(LOCAL_PROPRIETARY_MODULE)))

    LOCAL_USE_VNDK:=true

    LOCAL_USE_VNDK:=true

  else

  else

    ifneq (,$(filter $(TARGET_OUT_VENDOR)%,$(LOCAL_MODULE_PATH) $(LOCAL_MODULE_PATH_32) $(LOCAL_MODULE_PATH_64)))

    ifneq (,$(filter $(TARGET_OUT_VENDOR)%,$(LOCAL_MODULE_PATH) $(LOCAL_MODULE_PATH_32) $(LOCAL_MODULE_PATH_64)))