am aa9c5b9f: am e7754220: Merge "Merge "Move Windows SDK whitelist out of main.mk""

* commit 'aa9c5b9f89047642010fe165f7815e1fb67b867c':
  Merge "Move Windows SDK whitelist out of main.mk"
This commit is contained in:
Jean-Baptiste Queru 2012-02-14 16:25:15 -08:00 committed by Android Git Automerger
commit 693e7d5e09
1 changed files with 2 additions and 67 deletions

View File

@ -391,73 +391,8 @@ SDK_ONLY := true
endif
ifeq ($(SDK_ONLY),true)
# ----- SDK for Windows ------
# These configure the build targets that are available for the SDK under Windows.
# The first section defines all the C/C++ tools that can be compiled in C/C++,
# the second section defines all the Java ones (assuming javac is available.)
subdirs := \
prebuilt \
build/libs/host \
build/tools/zipalign \
dalvik/dexdump \
dalvik/libdex \
dalvik/tools/dmtracedump \
dalvik/tools/hprof-conv \
development/host \
development/tools/etc1tool \
development/tools/line_endings \
development/tools/emulator/opengl \
external/clang \
external/easymock \
external/expat \
external/libpng \
external/llvm \
external/qemu \
external/sqlite/dist \
external/zlib \
frameworks/base \
frameworks/compile \
sdk/avdlauncher \
sdk/emulator/mksdcard \
sdk/sdklauncher \
system/core/adb \
system/core/fastboot \
system/core/libcutils \
system/core/liblog \
system/core/libzipfile
# The following can only be built if "javac" is available.
# This check is used when building parts of the SDK under Cygwin.
ifneq (,$(shell which javac 2>/dev/null))
subdirs += \
build/tools/signapk \
dalvik/dx \
libcore \
sdk/archquery \
sdk/androidprefs \
sdk/apkbuilder \
sdk/assetstudio \
sdk/common \
sdk/ddms \
sdk/hierarchyviewer2 \
sdk/ide_common \
sdk/jarutils \
sdk/layoutlib_api \
sdk/ninepatch \
sdk/rule_api \
sdk/lint \
sdk/sdkstats \
sdk/sdkmanager \
sdk/swtmenubar \
sdk/traceview \
development/apps \
development/tools/mkstubs \
packages
else
$(warning SDK_ONLY: javac not available.)
endif
include $(TOPDIR)sdk/build/sdk_only_whitelist.mk
include $(TOPDIR)development/build/sdk_only_whitelist.mk
# Exclude tools/acp when cross-compiling windows under linux
ifeq ($(findstring Linux,$(UNAME)),)