diff options
| author | Brian Carlstrom <bdc@google.com> | 2011-03-24 22:18:06 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2011-03-24 22:18:06 -0700 |
| commit | b4088b380f61a3944ea20ccd746f5ddbf223847f (patch) | |
| tree | 347e866c9372adaf3af0873bd1704e01c1649d4d /JavaLibrary.mk | |
| parent | 151a354918ba4b62c0c761a857d4fcdee26164ce (diff) | |
| parent | cfa84a2aac159bb8a1763298882df7aa98f7fc6f (diff) | |
| download | libcore-b4088b380f61a3944ea20ccd746f5ddbf223847f.zip libcore-b4088b380f61a3944ea20ccd746f5ddbf223847f.tar.gz libcore-b4088b380f61a3944ea20ccd746f5ddbf223847f.tar.bz2 | |
resolved conflicts for merge of cfa84a2a to dalvik-dev
Change-Id: I7765cd4bf03f0b18e60848c30dcce30cbdd7c77b
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index d4afcd2..08459fa 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -206,7 +206,7 @@ include $(CLEAR_VARS) # for shared defintion of libcore_to_document include $(LOCAL_PATH)/Docs.mk -LOCAL_SRC_FILES:=$(call find-other-java-files, $(libcore_to_document)) +LOCAL_SRC_FILES:=$(call libcore_to_document,$(LOCAL_PATH)) # rerun doc generation without recompiling the java LOCAL_JAVA_LIBRARIES:= LOCAL_JAVACFLAGS := $(local_javac_flags) |