Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c04b56c5 authored by Raphael Moll's avatar Raphael Moll Committed by Raphael Moll
Browse files

Merge "Move Windows SDK whitelist out of main.mk" 

This replaces the list maintained in build/core/main.mk
by 2 makefiles in sdk.git and development.git.

Pre-requisite CLs: Change Ifa8111dbae for sdk.git
and Change Ie6f728bee for development.git

(cherry-pick of 347f3051)

Change-Id: I6d1f4c974a6425e50e3e287c66a4e8090cf814cb
parent 45873583

core/main.mk

+2 −67
Original line number Diff line number Diff line
@@ -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)),)