summaryrefslogtreecommitdiffstats
path: root/dx
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-09-04 13:14:45 -0700
committerYing Wang <wangying@google.com>2014-09-04 13:14:45 -0700
commit4de3efd5e674f26b3f45fbb0df9a1772948c8785 (patch)
tree2ba71355a830798a14113575d9118592d1386680 /dx
parent870b4f2d70d67d6dbb7d0881d101c61bed8caad2 (diff)
downloadandroid_dalvik-4de3efd5e674f26b3f45fbb0df9a1772948c8785.tar.gz
android_dalvik-4de3efd5e674f26b3f45fbb0df9a1772948c8785.tar.bz2
android_dalvik-4de3efd5e674f26b3f45fbb0df9a1772948c8785.zip
Add libcore src to the dx docs module.
This fixed bogus docs build errors like: dalvik/dx/src/com/android/dx/io/DexIndexPrinter.java:19: error: package com.android.dex does not exist Change-Id: I3217a51c1562194974410c54f936c0713455a93c
Diffstat (limited to 'dx')
-rw-r--r--dx/src/Android.mk11
1 files changed, 8 insertions, 3 deletions
diff --git a/dx/src/Android.mk b/dx/src/Android.mk
index e53144d67..b9673dba4 100644
--- a/dx/src/Android.mk
+++ b/dx/src/Android.mk
@@ -5,12 +5,15 @@ LOCAL_PATH := $(call my-dir)
# This tool is prebuilt if we're doing an app-only build.
ifeq ($(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)),)
+dx_src_files := \
+ $(call all-subdir-java-files) \
+ $(call all-java-files-under,../../../libcore/dex/src/main/java)
+
# dx java library
# ============================================================
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_SRC_FILES += $(call all-java-files-under,../../../libcore/dex/src/main/java)
+LOCAL_SRC_FILES := $(dx_src_files)
LOCAL_JAR_MANIFEST := ../etc/manifest.txt
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= dx
@@ -29,7 +32,7 @@ endif # No TARGET_BUILD_APPS or TARGET_BUILD_PDK
# ============================================================
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-subdir-java-files) $(call all-subdir-html-files)
+LOCAL_SRC_FILES := $(dx_src_files) $(call all-subdir-html-files)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= dx
LOCAL_DROIDDOC_OPTIONS := -hidden
@@ -37,3 +40,5 @@ LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_IS_HOST_MODULE := true
include $(BUILD_DROIDDOC)
+
+dx_src_files :=