summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChirayu Desai <cdesai@cyanogenmod.org>2013-03-24 23:58:54 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-04-13 06:38:53 -0700
commitba6ee56fa204c6df9afb4d6d4e12cf90662fc240 (patch)
tree996db2d7dda429aa7d558e8449a00920af33f4fc
parentf751d253e0f996fc83cac8bdef8d7a469be63283 (diff)
downloadbuild-ba6ee56fa204c6df9afb4d6d4e12cf90662fc240.zip
build-ba6ee56fa204c6df9afb4d6d4e12cf90662fc240.tar.gz
build-ba6ee56fa204c6df9afb4d6d4e12cf90662fc240.tar.bz2
Revert "Allow disabling DroidDoc build."
This reverts commit 875e83165081425e74ce7c999b51c01cac0c876c Change-Id: I670a1bea555cc7ac8346fba347b9cb40092c3da1
-rw-r--r--core/config.mk7
1 files changed, 1 insertions, 6 deletions
diff --git a/core/config.mk b/core/config.mk
index 894d7ff..ab06f6a 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -75,16 +75,11 @@ BUILD_MULTI_PREBUILT:= $(BUILD_SYSTEM)/multi_prebuilt.mk
BUILD_JAVA_LIBRARY:= $(BUILD_SYSTEM)/java_library.mk
BUILD_STATIC_JAVA_LIBRARY:= $(BUILD_SYSTEM)/static_java_library.mk
BUILD_HOST_JAVA_LIBRARY:= $(BUILD_SYSTEM)/host_java_library.mk
+BUILD_DROIDDOC:= $(BUILD_SYSTEM)/droiddoc.mk
BUILD_COPY_HEADERS := $(BUILD_SYSTEM)/copy_headers.mk
BUILD_NATIVE_TEST := $(BUILD_SYSTEM)/native_test.mk
BUILD_HOST_NATIVE_TEST := $(BUILD_SYSTEM)/host_native_test.mk
-ifneq ($(DISABLE_DROIDDOC),)
-BUILD_DROIDDOC:= $(BUILD_SYSTEM)/clear_vars.mk
-else
-BUILD_DROIDDOC:= $(BUILD_SYSTEM)/droiddoc.mk
-endif
-
-include cts/build/config.mk
# ###############################################################