From 51ea18a43727aa1cad9c31c4fe9e984dfeda9ffa Mon Sep 17 00:00:00 2001
From: dimitry <dimitry@google.com>
Date: Mon, 20 May 2019 10:39:52 +0200
Subject: [PATCH] Skip native_bridge modules when installing vndk snapshot

Do not install natively bridged libraries as part of vndk snapshot.

Bug: http://b/77159578
Test: Enable 4arch build -> make
Change-Id: I519ef92ca356ee6438abb3c85fa639af2170c2ef
---
 cc/vndk.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cc/vndk.go b/cc/vndk.go
index a1d67af10..41d3fdbc2 100644
--- a/cc/vndk.go
+++ b/cc/vndk.go
@@ -455,6 +455,10 @@ func (c *vndkSnapshotSingleton) GenerateBuildActions(ctx android.SingletonContex
 			return
 		}
 
+		if m.Target().NativeBridge == android.NativeBridgeEnabled {
+			return
+		}
+
 		lib, is_lib := m.linker.(*libraryDecorator)
 		prebuilt_lib, is_prebuilt_lib := m.linker.(*prebuiltLibraryLinker)