openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

merge from open-source master 

Change-Id: Ie49d1b19914fcfefedfdfc070800426d4b13dd46
This commit is contained in:
The Android Open Source Project 2010-04-28 15:55:08 -07:00
parent e611eef001 7058f499e9
commit cd0bd8011b
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/main.mk
View File

@ -352,18 +352,21 @@ endif
# Bring in all modules that need to be built. # Bring in all modules that need to be built.
ifneq ($(dont_bother),true) ifneq ($(dont_bother),true)
ifeq ($(HOST_OS),windows)
SDK_ONLY := true
endif
ifeq ($(HOST_OS)-$(HOST_ARCH),darwin-ppc) ifeq ($(HOST_OS)-$(HOST_ARCH),darwin-ppc)
SDK_ONLY := true SDK_ONLY := true
$(info Building the SDK under darwin-ppc is actually obsolete and unsupported.)
$(error stop)
endif
ifeq ($(HOST_OS),windows)
SDK_ONLY := true
endif endif
ifeq ($(SDK_ONLY),true) ifeq ($(SDK_ONLY),true)
# ----- SDK for Windows ------ # ----- SDK for Windows ------
# These configure the build targets that are available for the SDK under Cygwin. # 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 under Cygwin, # 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.) # the second section defines all the Java ones (assuming javac is available.)
subdirs := \ subdirs := \
@ -384,10 +387,7 @@ subdirs := \
external/qemu \ external/qemu \
external/sqlite/dist \ external/sqlite/dist \
external/zlib \ external/zlib \
frameworks/base/libs/utils \ frameworks/base \
frameworks/base/tools/aapt \
frameworks/base/tools/aidl \
frameworks/base/opengl/libs \
system/core/adb \ system/core/adb \
system/core/fastboot \ system/core/fastboot \
system/core/libcutils \ system/core/libcutils \
@ -397,7 +397,6 @@ subdirs := \
# The following can only be built if "javac" is available. # The following can only be built if "javac" is available.
# This check is used when building parts of the SDK under Cygwin. # This check is used when building parts of the SDK under Cygwin.
ifneq (,$(shell which javac 2>/dev/null)) ifneq (,$(shell which javac 2>/dev/null))
$(warning sdk-only: javac available.)
subdirs += \ subdirs += \
build/tools/signapk \ build/tools/signapk \
dalvik/dx \ dalvik/dx \
@ -414,10 +413,9 @@ subdirs += \
sdk/layoutopt \ sdk/layoutopt \
development/apps \ development/apps \
development/tools/mkstubs \ development/tools/mkstubs \
frameworks/base/tools/layoutlib \
packages packages
else else
$(warning sdk-only: javac not available.) $(warning SDK_ONLY: javac not available.)
endif endif
# Exclude tools/acp when cross-compiling windows under linux # Exclude tools/acp when cross-compiling windows under linux