commit 9f847581b722e3b45705f54264cbdaa6a83264ee
author Bob Badour <bbadour@google.com> Thu Jul 14 10:38:27 2022 -0700
committer Bob Badour <bbadour@google.com> Thu Jul 14 10:40:01 2022 -0700
tree c26b71dda4f3673aac6e62252a724a64911e0d3b
parent 50dbe0a07408bc1b16b1c19720d464a98e618f23

Keep Notice property from erasing license texts.

Remove "default to file in directory". Use explicit applicable license.

Bug: 192434786

Test: m droid dist

Change-Id: Id3d845b2073f151a8c0bad874e7ab005771bdfcb

android/androidmk.go

diff --git a/android/androidmk.go b/android/androidmk.go
index 832c7df..d6fe06d 100644
--- a/android/androidmk.go
+++ b/android/androidmk.go
@@ -605,7 +605,7 @@
 	}
 
 	if len(base.noticeFiles) > 0 {
-		a.SetString("LOCAL_NOTICE_FILE", strings.Join(base.noticeFiles.Strings(), " "))
+		a.AddStrings("LOCAL_NOTICE_FILE", strings.Join(base.noticeFiles.Strings(), " "))
 	}
 
 	if host {