tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Move extra VNDKs to /system_ext"

Browse source 
am: 79961687db

Change-Id: I6ce460a4b6a08d162fadbdb147c1b16cc70c2c26
This commit is contained in:
Jooyung Han 2019-12-05 01:04:28 -08:00 committed by android-build-merger
commit 1fba30a983
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
target/product/gsi/Android.mk
View file

@ -162,10 +162,14 @@ endif
# TODO(b/141450808): remove following VNDK phony targets when **.libraries.txt files are provided by apexes. # TODO(b/141450808): remove following VNDK phony targets when **.libraries.txt files are provided by apexes.
LOCAL_REQUIRED_MODULES := \ LOCAL_REQUIRED_MODULES := \
$(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),vndk_v$(vndk_ver)_$(TARGET_ARCH)$(_binder32)) $(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 := _binder32 :=
include $(BUILD_PHONY_PACKAGE) 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 endif # BOARD_VNDK_VERSION is set
##################################################################### #####################################################################

1
target/product/media_system_ext.mk
View file

@ -22,3 +22,4 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/base_system_ext.mk)
# /system_ext packages # /system_ext packages
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
vndk_apex_snapshot_package \