From f2664c6b4ac2d1c80cf08dbf86ef0d78f030d5c2 Mon Sep 17 00:00:00 2001
From: Justin Yun <justinyun@google.com>
Date: Thu, 30 Jul 2020 18:57:54 +0900
Subject: [PATCH] Skip llndk_library and llndk_headers for vendor snapshot

llndk_library and llndk_headers are backward compatible. We may use
the source code instead of snapshot for those modules.

Bug: 161565086
Test: build with vendor snapshot
Change-Id: If3da3f9b31f7180d8d0835f8dbd7ba938a60d967
---
 cc/vendor_snapshot.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/cc/vendor_snapshot.go b/cc/vendor_snapshot.go
index fec0c8bb6..0af22580a 100644
--- a/cc/vendor_snapshot.go
+++ b/cc/vendor_snapshot.go
@@ -552,6 +552,13 @@ func isVendorSnapshotModule(m *Module, moduleDir string) bool {
 	if _, ok := m.linker.(*kernelHeadersDecorator); ok {
 		return false
 	}
+	// skip llndk_library and llndk_headers which are backward compatible
+	if _, ok := m.linker.(*llndkStubDecorator); ok {
+		return false
+	}
+	if _, ok := m.linker.(*llndkHeadersDecorator); ok {
+		return false
+	}
 
 	// Libraries
 	if l, ok := m.linker.(snapshotLibraryInterface); ok {