diff options
| author | Xavier Ducrohet <xav@android.com> | 2014-05-09 18:43:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-09 18:43:38 +0000 |
| commit | a77149d4b6a3425d18497d5bd0f1ab27111dbb58 (patch) | |
| tree | 87698e03f2d17570878f86085013e6128ab8e85b /build | |
| parent | a73ca7861870e7226db09e222e7f88e507021772 (diff) | |
| parent | 1130ca40b1043a55efb954bb86f91f1383d6f8c1 (diff) | |
| download | sdk-a77149d4b6a3425d18497d5bd0f1ab27111dbb58.zip sdk-a77149d4b6a3425d18497d5bd0f1ab27111dbb58.tar.gz sdk-a77149d4b6a3425d18497d5bd0f1ab27111dbb58.tar.bz2 | |
Merge "Disable build of windows SDK Tools"
Diffstat (limited to 'build')
| -rw-r--r-- | build/windows_sdk_tools.mk | 25 | ||||
| -rw-r--r-- | build/windows_sdk_whitelist.mk | 30 |
2 files changed, 20 insertions, 35 deletions
diff --git a/build/windows_sdk_tools.mk b/build/windows_sdk_tools.mk index 80f00c0..8bdcdba 100644 --- a/build/windows_sdk_tools.mk +++ b/build/windows_sdk_tools.mk @@ -3,28 +3,13 @@ # This makefile is included by development/build/tools/windows_sdk.mk # to device which tools we want to build from the sdk.git project. -# Define the list of tool-dependent modules to build for the Windows SDK. -# All these will be build using USE_MINGW=1 -WIN_SDK_TARGETS := \ - avdlauncher \ - emulator \ - emulator-arm \ - emulator-x86 \ - emulator-mips \ - find_java \ - find_lock \ - mksdcard \ - sdklauncher +# This contains the SDK Tools modules to build during a +# *platform* builds. Right now we are not building any SDK Tools +# during platform builds anymore. +# They are now built in an unbundled branch. +WIN_SDK_TARGETS := -# Add OpenGLES emulation host libraries if needed. -ifeq (true,$(BUILD_EMULATOR_OPENGL)) -WIN_SDK_TARGETS += \ - libOpenglRender \ - libGLES_CM_translator \ - libGLES_V2_translator \ - libEGL_translator -endif # Define the list of tool-dependent modules requisites needed # for the Windows SDK. These will be built using HOST_OS=linux. diff --git a/build/windows_sdk_whitelist.mk b/build/windows_sdk_whitelist.mk index 40b70e5..ea29f11 100644 --- a/build/windows_sdk_whitelist.mk +++ b/build/windows_sdk_whitelist.mk @@ -27,27 +27,27 @@ subdirs += \ external/openssl \ - external/qemu \ - prebuilts/tools \ - sdk/avdlauncher \ - sdk/emulator/mksdcard \ - sdk/emulator/opengl \ - sdk/find_java \ - sdk/find_lock \ - sdk/sdklauncher +# external/qemu \ +# prebuilts/tools \ +# sdk/avdlauncher \ +# sdk/emulator/mksdcard \ +# sdk/emulator/opengl \ +# sdk/find_java \ +# sdk/find_lock \ +# sdk/sdklauncher # ----- # Whitelist of SDK specific projects that DO require Java ifneq (,$(shell which javac 2>/dev/null)) subdirs += \ - external/ant-glob \ - external/eclipse-windowbuilder/propertysheet \ - external/hamcrest \ - external/junit \ - sdk/apkbuilder \ - sdk/eclipse/scripts/rcp \ - sdk/testutils +# external/ant-glob \ +# external/eclipse-windowbuilder/propertysheet \ +# external/hamcrest \ +# external/junit \ +# sdk/apkbuilder \ +# sdk/eclipse/scripts/rcp \ +# sdk/testutils else $(warning SDK_ONLY: javac not available.) |