commit ad503c265c8a916e853c409731d631f6d4db5e14
author Inseob Kim <inseob@google.com> Wed Sep 07 19:43:41 2022 +0900
committer Inseob Kim <inseob@google.com> Wed Sep 07 20:02:30 2022 +0900
tree 26e893c18fb7cedcba85fd1178ff2579af3ad26e
parent 7aad536922061e127ade0def733b36d66f844fa2

Check same vndk variants when builing vndk_package

Since the vndk apex is introduced, same vndk variants check has stopped
when building vndk_package, and it's performed only with checkbuild.

Bug: 244654349
Test: m vndk_package
Change-Id: Iee30b5df75565c024f93d40bc6eaa7a729c2e09c

target/product/gsi/Android.mk

diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk
index 85e551d..d02dc7a 100644
--- a/target/product/gsi/Android.mk
+++ b/target/product/gsi/Android.mk
@@ -185,6 +185,10 @@
     $(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES)) \
     $(VNDK_USING_CORE_VARIANT_LIBRARIES) \
     com.android.vndk.current
+
+LOCAL_ADDITIONAL_DEPENDENCIES += $(call module-built-files,\
+    $(addsuffix .vendor,$(VNDK_CORE_LIBRARIES) $(VNDK_SAMEPROCESS_LIBRARIES)))
+
 endif
 include $(BUILD_PHONY_PACKAGE)