diff options
| -rw-r--r-- | BoardConfigCommon.mk | 2 | ||||
| -rw-r--r-- | sdm660.mk | 5 | ||||
| -rw-r--r-- | vndk/Android.mk | 49 | ||||
| -rw-r--r-- | vndk/vndk-sp-libs.mk | 33 |
4 files changed, 4 insertions, 85 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 0d16b2a..2eec224 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -256,6 +256,8 @@ BOARD_PLAT_PRIVATE_SEPOLICY_DIR += $(COMMON_PATH)/sepolicy/private # Treble PRODUCT_FULL_TREBLE_OVERRIDE := true PRODUCT_VENDOR_MOVE_ENABLED := true +BOARD_VNDK_RUNTIME_DISABLE := true +BOARD_VNDK_VERSION := current # Timeservice BOARD_USES_QC_TIME_SERVICES := true @@ -423,9 +423,8 @@ PRODUCT_PACKAGES += \ android.hardware.vibrator@1.0-impl \ android.hardware.vibrator@1.0-service -# VNDK-SP: -PRODUCT_PACKAGES += \ - vndk-sp +# VNDK +PRODUCT_PACKAGES += vndk_package # Wifi PRODUCT_PACKAGES += \ diff --git a/vndk/Android.mk b/vndk/Android.mk deleted file mode 100644 index 81d67f8..0000000 --- a/vndk/Android.mk +++ /dev/null @@ -1,49 +0,0 @@ -ifeq ($(BOARD_VNDK_VERSION),) -$(warning ************* BOARD VNDK is not enabled - compiling vndk-sp ***************************) -LOCAL_PATH := $(call my-dir) - -include $(LOCAL_PATH)/vndk-sp-libs.mk - -vndk_sp_dir := vndk-sp-$(PLATFORM_VNDK_VERSION) - -define define-vndk-sp-lib -include $$(CLEAR_VARS) -LOCAL_MODULE := $1.vndk-sp-gen -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_PREBUILT_MODULE_FILE := $$(TARGET_OUT_INTERMEDIATE_LIBRARIES)/$1.so -LOCAL_STRIP_MODULE := false -LOCAL_MULTILIB := first -LOCAL_MODULE_TAGS := optional -LOCAL_INSTALLED_MODULE_STEM := $1.so -LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_RELATIVE_PATH := $(vndk_sp_dir) -include $$(BUILD_PREBUILT) - -ifneq ($$(TARGET_2ND_ARCH),) -ifneq ($$(TARGET_TRANSLATE_2ND_ARCH),true) -include $$(CLEAR_VARS) -LOCAL_MODULE := $1.vndk-sp-gen -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_PREBUILT_MODULE_FILE := $$($$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES)/$1.so -LOCAL_STRIP_MODULE := false -LOCAL_MULTILIB := 32 -LOCAL_MODULE_TAGS := optional -LOCAL_INSTALLED_MODULE_STEM := $1.so -LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_RELATIVE_PATH := $(vndk_sp_dir) -include $$(BUILD_PREBUILT) -endif # TARGET_TRANSLATE_2ND_ARCH is not true -endif # TARGET_2ND_ARCH is not empty -endef - -$(foreach lib,$(VNDK_SP_LIBRARIES),\ - $(eval $(call define-vndk-sp-lib,$(lib)))) - -include $(CLEAR_VARS) -LOCAL_MODULE := vndk-sp -LOCAL_MODULE_TAGS := optional -LOCAL_REQUIRED_MODULES := $(addsuffix .vndk-sp-gen,$(VNDK_SP_LIBRARIES)) -include $(BUILD_PHONY_PACKAGE) - -vndk_sp_dir := -endif diff --git a/vndk/vndk-sp-libs.mk b/vndk/vndk-sp-libs.mk deleted file mode 100644 index 11dc236..0000000 --- a/vndk/vndk-sp-libs.mk +++ /dev/null @@ -1,33 +0,0 @@ -VNDK_SP_LIBRARIES := \ - android.hardware.graphics.allocator@2.0 \ - android.hardware.graphics.mapper@2.0 \ - android.hardware.graphics.mapper@2.1 \ - android.hardware.graphics.common@1.0 \ - android.hardware.graphics.common@1.1 \ - android.hardware.renderscript@1.0 \ - android.hidl.base@1.0 \ - android.hidl.memory@1.0 \ - libRSCpuRef \ - libRSDriver \ - libRS_internal \ - libbacktrace \ - libbase \ - libbcinfo \ - libblas \ - libc++ \ - libcompiler_rt \ - libcutils \ - libft2 \ - libhardware \ - libhidlbase \ - libhidlmemory \ - libhidltransport \ - libhwbinder \ - libion \ - liblzma \ - libpng \ - libunwind \ - libunwindstack \ - libutils \ - libutilscallstack \ - libdexfile |