commit 8d4cf4fbc6d164960275e2993baad28702681393
author Brett Chabot <brettchabot@android.com> Tue Jan 17 15:48:23 2012 -0800
committer Hugo Hudson <hugohudson@google.com> Tue Jan 24 14:28:34 2012 +0000
tree 703b326be618e7296e10a9bcec788fb70fa91524
parent f225da938fc7f1fe77813cee6ceb33fea3d19f06

Fix Android.mk.

- build source as com.* namespace instead of java.com.*
- include both dx and dexmaker source

Change-Id: I0c55793aff72d24eceea36101b33ae4d8ef3cdf0

Android.mk

diff --git a/Android.mk b/Android.mk
index dc9ffa0..58d1211 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,8 +16,7 @@
 include $(CLEAR_VARS)
 
 # Include all the java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src/main)
-LOCAL_SRC_FILES := $(call all-java-files-under, src/dx)
+LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java src/dx/java)
 
 LOCAL_SDK_VERSION := 14