Skip native_bridge modules when listing VNDK libs

native_bridge modules cannot be VNDK modules at the same time.

Bug: 137709824
Test: build cf_x86_64_phone
      check if llndk.libraries.*.txt has libclang_rt.asan for arm

Change-Id: I974e89b9da522e26531a576015e98dc54834282d

parent 2b9e20ef

cc/vndk.go

+4 −1

Original line number	Diff line number	Diff line
		@@ -317,10 +317,13 @@ func VndkMutator(mctx android.BottomUpMutatorContext) {
		if !ok {
		return
		}

		if !m.Enabled() {
		return
		}
		if m.Target().NativeBridge == android.NativeBridgeEnabled {
		// Skip native_bridge modules
		return
		}

		if m.isVndk() {
		if lib, ok := m.linker.(*vndkPrebuiltLibraryDecorator); ok {