commit c3b97c3568ae790ce0665c661e1f32f77359fb38
author Alex Márquez Pérez Muñíz Díaz Púras Thaureaux <alexmarquez@google.com> Tue Oct 05 13:43:23 2021 -0400
committer Alex Márquez Pérez Muñíz Díaz Púras Thaureaux <alexmarquez@google.com> Thu Jan 20 12:03:18 2022 -0500
tree 875671c0aa5f0cc5f8c7eb7a9478cb8199091f86
parent 2c32bbfd7339cc5c6f7bf51bc48bbd90310a61f7

libclang_rt_prebuilt_library_shared mixed builds

Also fix nil deref in setting $LOCAL_SOONG_UNSTRIPPED_BINARY

Bug: 201802518
Test: request_type_test.go
Test: prebuilt_test.go:TestPrebuiltLibrarySharedWithBazel
Test: mixed_{libc,droid}.sh
Change-Id: I22afb56c4b42d3412c2b2e1f079f1bcf8f3129a7

cc/androidmk.go

diff --git a/cc/androidmk.go b/cc/androidmk.go
index 800b58f..f6fe6f7 100644
--- a/cc/androidmk.go
+++ b/cc/androidmk.go
@@ -241,7 +241,7 @@
 		entries.Class = "SHARED_LIBRARIES"
 		entries.ExtraEntries = append(entries.ExtraEntries, func(_ android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
 			entries.SetString("LOCAL_SOONG_TOC", library.toc().String())
-			if !library.buildStubs() {
+			if !library.buildStubs() && library.unstrippedOutputFile != nil {
 				entries.SetString("LOCAL_SOONG_UNSTRIPPED_BINARY", library.unstrippedOutputFile.String())
 			}
 			if len(library.Properties.Overrides) > 0 {