commit 491fe5ffd8446d8863845c3febe0e4d619662f24
author Jaewoong Jung <jungjw@google.com> Mon Nov 19 16:18:54 2018 +0000
committer Jaewoong Jung <jungjw@google.com> Mon Nov 19 16:18:54 2018 +0000
tree 726bdb04e8ff5051ce35ae27d2886aa2db2cf35b
parent ff7a1a47d90ea962af8241952f29019fd45d7692

Revert "Add filegroup support to notice property."

This reverts commit ff7a1a47d90ea962af8241952f29019fd45d7692.

Reason for revert: Broke ART buildbot

Change-Id: I005ccfcc2c36bbcb274cb2a069fc701168faacd2

android/androidmk.go

diff --git a/android/androidmk.go b/android/androidmk.go
index f150768..493ba97 100644
--- a/android/androidmk.go
+++ b/android/androidmk.go
@@ -277,8 +277,8 @@
 		}
 	}
 
-	if amod.noticeFile != nil {
-		fmt.Fprintln(&data.preamble, "LOCAL_NOTICE_FILE :=", amod.noticeFile.String())
+	if amod.commonProperties.Notice != nil {
+		fmt.Fprintln(&data.preamble, "LOCAL_NOTICE_FILE :=", "$(LOCAL_PATH)/"+*amod.commonProperties.Notice)
 	}
 
 	if host {