commit 558a2d164a7c9c307a6d70820b11f29a7997504e
author Narayan Kamath <narayan@google.com> Tue Dec 22 14:37:40 2015 +0000
committer Narayan Kamath <narayan@google.com> Tue Dec 22 19:04:23 2015 +0000
tree 11dc0ba4fd5bd61d445b1c45920061182d47ce2e
parent 9777098f315536b148c5b921e0f3b41a6342b1dd

Override notice file for OpenJdk based modules.

Change-Id: Iffeffc2ed0cfe4c1568c74ddf3176de22930b2a5

JavaLibrary.mk

diff --git a/JavaLibrary.mk b/JavaLibrary.mk
index 906916d..51e0178 100644
--- a/JavaLibrary.mk
+++ b/JavaLibrary.mk
@@ -104,6 +104,7 @@
 LOCAL_MODULE := core-oj
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk
 LOCAL_JAVA_LIBRARIES := core-all
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/ojluni/NOTICE
 LOCAL_REQUIRED_MODULES := tzdata
 LOCAL_CORE_LIBRARY := true
 LOCAL_REQUIRED_MODULES := currency.data-target
@@ -198,6 +199,7 @@
 LOCAL_DX_FLAGS := --core-library
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := core-oj-hostdex
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/ojluni/NOTICE
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk
 LOCAL_JAVA_LIBRARIES := core-all-hostdex
 LOCAL_REQUIRED_MODULES := tzdata-host