commit 18d209582e0bb1caed97102a86b416173f5aad42
author Narayan Kamath <narayan@google.com> Tue Dec 22 14:56:59 2015 +0000
committer Narayan Kamath <narayan@google.com> Tue Dec 22 19:17:45 2015 +0000
tree 5c79afefe9f895a6b752d98d92127a6c0884f846
parent 424446ba807186a374e1789296d651ddfe6f214c

Override notice file for OpenJdk based modules.

Change-Id: Iff63708c83c2a18b82f0de6aa884e1388ed8b32b

runtime/Android.mk

diff --git a/runtime/Android.mk b/runtime/Android.mk
index e4a370c..c561ac0 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -362,7 +362,7 @@
   thread_state.h \
   verifier/method_verifier.h
 
-LIBOPENJDKJVM_SRC_FILES := native/OpenjdkJvm.cc
+LIBOPENJDKJVM_SRC_FILES := openjdkjvm/OpenjdkJvm.cc
 
 LIBART_CFLAGS := -DBUILDING_LIBART=1
 
@@ -560,6 +560,7 @@
     else
       LOCAL_SHARED_LIBRARIES += libartd
     endif
+    LOCAL_NOTICE_FILE := $(LOCAL_PATH)/openjdkjvm/NOTICE
   endif
   LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk
   LOCAL_ADDITIONAL_DEPENDENCIES += $$(LOCAL_PATH)/Android.mk