p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Revert "Revert "Revert "install VNDK APEX instead of VNDK libs"""" am: 35815917ba 

am: c443c0b348

Change-Id: I8a6328744d4839041a07b1c3db56c564e860aae4
This commit is contained in:
Greg Kaiser 2019-10-28 10:26:00 -07:00 committed by android-build-merger
parent 01fcd076fd c443c0b348
commit dbaee05a78
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,8 +145,7 @@ LOCAL_REQUIRED_MODULES += \
vndkprivate.libraries.txt \ vndkprivate.libraries.txt \
vndkcorevariant.libraries.txt \ vndkcorevariant.libraries.txt \
$(addsuffix .vendor,$(VNDK_CORE_LIBRARIES)) \ $(addsuffix .vendor,$(VNDK_CORE_LIBRARIES)) \
$(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES)) \ $(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES))
com.android.vndk.current
endif endif
include $(BUILD_PHONY_PACKAGE) include $(BUILD_PHONY_PACKAGE)
@ -158,11 +157,8 @@ ifneq ($(TARGET_IS_64_BIT),true)
_binder32 := _binder32 _binder32 := _binder32
endif endif
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 := \ 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)