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

Revert "Revert "install VNDK APEX instead of VNDK libs""

Browse source 
This reverts commit 376c613085.

Bug: 141451661
Test: m && boot (tested with cuttlefish)
This commit is contained in:
Jooyung Han 2019-10-18 16:16:38 +09:00
parent 8de0013551
commit 6851a27604
1 changed files with 5 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

@ -154,7 +154,8 @@ LOCAL_REQUIRED_MODULES += \
vndkprivate.libraries.txt \
vndkcorevariant.libraries.txt \
$(addsuffix .vendor,$(VNDK_CORE_LIBRARIES)) \
$(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES))
$(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES)) \
com.android.vndk.current
endif
include $(BUILD_PHONY_PACKAGE)
@ -166,8 +167,11 @@ ifneq ($(TARGET_IS_64_BIT),true)
_binder32 := _binder32
endif
endif
# Phony targets are installed for **.libraries.txt files.
# 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)