sdm660-common: Migrate to versioned VNDK layout
Bug: 78605339 Test: boots Change-Id: I43a22047d0bd21c57a2eee866799a96582aa6d70
This commit is contained in:
parent
8c2ec833d4
commit
7f89f773d1
1 changed files with 6 additions and 2 deletions
|
@ -4,6 +4,8 @@ LOCAL_PATH := $(call my-dir)
|
||||||
|
|
||||||
include $(LOCAL_PATH)/vndk-sp-libs.mk
|
include $(LOCAL_PATH)/vndk-sp-libs.mk
|
||||||
|
|
||||||
|
vndk_sp_dir := vndk-sp-$(PLATFORM_VNDK_VERSION)
|
||||||
|
|
||||||
define define-vndk-sp-lib
|
define define-vndk-sp-lib
|
||||||
include $$(CLEAR_VARS)
|
include $$(CLEAR_VARS)
|
||||||
LOCAL_MODULE := $1.vndk-sp-gen
|
LOCAL_MODULE := $1.vndk-sp-gen
|
||||||
|
@ -14,7 +16,7 @@ LOCAL_MULTILIB := first
|
||||||
LOCAL_MODULE_TAGS := optional
|
LOCAL_MODULE_TAGS := optional
|
||||||
LOCAL_INSTALLED_MODULE_STEM := $1.so
|
LOCAL_INSTALLED_MODULE_STEM := $1.so
|
||||||
LOCAL_MODULE_SUFFIX := .so
|
LOCAL_MODULE_SUFFIX := .so
|
||||||
LOCAL_MODULE_RELATIVE_PATH := vndk-sp
|
LOCAL_MODULE_RELATIVE_PATH := $(vndk_sp_dir)
|
||||||
include $$(BUILD_PREBUILT)
|
include $$(BUILD_PREBUILT)
|
||||||
|
|
||||||
ifneq ($$(TARGET_2ND_ARCH),)
|
ifneq ($$(TARGET_2ND_ARCH),)
|
||||||
|
@ -28,7 +30,7 @@ LOCAL_MULTILIB := 32
|
||||||
LOCAL_MODULE_TAGS := optional
|
LOCAL_MODULE_TAGS := optional
|
||||||
LOCAL_INSTALLED_MODULE_STEM := $1.so
|
LOCAL_INSTALLED_MODULE_STEM := $1.so
|
||||||
LOCAL_MODULE_SUFFIX := .so
|
LOCAL_MODULE_SUFFIX := .so
|
||||||
LOCAL_MODULE_RELATIVE_PATH := vndk-sp
|
LOCAL_MODULE_RELATIVE_PATH := $(vndk_sp_dir)
|
||||||
include $$(BUILD_PREBUILT)
|
include $$(BUILD_PREBUILT)
|
||||||
endif # TARGET_TRANSLATE_2ND_ARCH is not true
|
endif # TARGET_TRANSLATE_2ND_ARCH is not true
|
||||||
endif # TARGET_2ND_ARCH is not empty
|
endif # TARGET_2ND_ARCH is not empty
|
||||||
|
@ -42,4 +44,6 @@ LOCAL_MODULE := vndk-sp
|
||||||
LOCAL_MODULE_TAGS := optional
|
LOCAL_MODULE_TAGS := optional
|
||||||
LOCAL_REQUIRED_MODULES := $(addsuffix .vndk-sp-gen,$(VNDK_SP_LIBRARIES))
|
LOCAL_REQUIRED_MODULES := $(addsuffix .vndk-sp-gen,$(VNDK_SP_LIBRARIES))
|
||||||
include $(BUILD_PHONY_PACKAGE)
|
include $(BUILD_PHONY_PACKAGE)
|
||||||
|
|
||||||
|
vndk_sp_dir :=
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in a new issue