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

Commit 79961687 authored Dec 05, 2019 by Jooyung Han Committed by Gerrit Code Review Dec 05, 2019

Merge "Move extra VNDKs to /system_ext"

parents c55b2f51 fe15dd1e

target/product/gsi/Android.mk

+5 −1

Original line number	Diff line number	Diff line
		@@ -162,10 +162,14 @@ endif
		# TODO(b/141450808): remove following VNDK phony targets when **.libraries.txt files are provided by apexes.
		LOCAL_REQUIRED_MODULES := \
		$(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),vndk_v$(vndk_ver)_$(TARGET_ARCH)$(_binder32))
		LOCAL_REQUIRED_MODULES += $(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),com.android.vndk.v$(vndk_ver))
		_binder32 :=
		include $(BUILD_PHONY_PACKAGE)

		include $(CLEAR_VARS)
		LOCAL_MODULE := vndk_apex_snapshot_package
		LOCAL_REQUIRED_MODULES := $(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),com.android.vndk.v$(vndk_ver))
		include $(BUILD_PHONY_PACKAGE)

		endif # BOARD_VNDK_VERSION is set

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

target/product/media_system_ext.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,3 +22,4 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/base_system_ext.mk)

		# /system_ext packages
		PRODUCT_PACKAGES += \
		vndk_apex_snapshot_package \