Merge changes Ifc818a69,I433b33d0 am: be20684665 am: 576f858aaaandroid-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2android-o-preview-1android-n-mr2-preview-2android-n-mr2-preview-1android-n-iot-preview-4o-previewn-iot-preview-4

am: e17dd6e292

Change-Id: I138d1f62987b5c2e3328e5ffa101feb592768cea

6 files changed, 0 insertions, 305 deletions

diff --git a/avdlauncher/Android.mk b/avdlauncher/Android.mk
deleted file mode 100644
index 97b6d732d..000000000
--- a/avdlauncher/Android.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2011 The Android Open Source Project
-#
-# Android.mk for avdlauncher
-#
-# The "AVD Launcher" is for Windows only.
-# This simple .exe will sit at the root of the Windows SDK
-# and currently simply executes tools\android.bat.
-# Eventually it should simply replace the batch file.
-
-
-#----- The current C++ avdlauncher -----
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-ifeq ($(HOST_OS),windows)
-
-LOCAL_SRC_FILES := \
-	src/source/avdlauncher.c
-
-LOCAL_CFLAGS += -Wall -Wno-unused-parameter
-LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE -DSH_HISTORY
-LOCAL_MODULE := avdlauncher
-
-LOCAL_MODULE_TAGS := optional
-
-# Locate windres executable
-WINDRES := windres
-ifneq ($(USE_MINGW),)
-  # When building the resources under Linux, use the MinGW one
-  WINDRES := i586-mingw32msvc-windres
-endif
-
-# Link the Windows icon file as well into the executable, based on the technique
-# used in external/qemu/Makefile.android.  The variables need to have different
-# names to not interfere with the ones from qemu/Makefile.android.
-#
-INTERMEDIATE     := $(call intermediates-dir-for,EXECUTABLES,$(LOCAL_MODULE),true)
-AVDLAUNCHER_ICON_OBJ := avdlauncher_icon.o
-AVDLAUNCHER_ICON_PATH := $(LOCAL_PATH)/images
-$(AVDLAUNCHER_ICON_PATH)/$(AVDLAUNCHER_ICON_OBJ): $(AVDLAUNCHER_ICON_PATH)/android_icon.rc
-	$(WINDRES) $< -I $(AVDLAUNCHER_ICON_PATH) -o $@
-
-# seems to be the only way to add an object file that was not generated from
-# a C/C++/Java source file to our build system. and very unfortunately,
-# $(TOPDIR)/$(LOCALPATH) will always be prepended to this value, which forces
-# us to put the object file in the source directory...
-#
-LOCAL_PREBUILT_OBJ_FILES += images/$(AVDLAUNCHER_ICON_OBJ)
-
-include $(BUILD_HOST_EXECUTABLE)
-
-$(call dist-for-goals,droid,$(LOCAL_BUILT_MODULE))
-
-endif
-
diff --git a/build/windows_sdk_tools.mk b/build/windows_sdk_tools.mk
index 8bdcdba81..722b9a3b7 100644
--- a/build/windows_sdk_tools.mk
+++ b/build/windows_sdk_tools.mk
@@ -10,10 +10,3 @@
 
 WIN_SDK_TARGETS := 
 
-
-# Define the list of tool-dependent modules requisites needed
-# for the Windows SDK. These will be built using HOST_OS=linux.
-# Temporarily disabled: See b/8992787
-#WIN_SDK_BUILD_PREREQ := \
-#	monitor
-
diff --git a/build/windows_sdk_whitelist.mk b/build/windows_sdk_whitelist.mk
deleted file mode 100644
index 31bf47122..000000000
--- a/build/windows_sdk_whitelist.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-# Whitelist of SDK projects that can be built for the SDK on Windows
-
-# The Windows SDK cannot build all the projects from the SDK tree, typically
-# due to obvious compiler/architectures differences. When building the Windows
-# SDK, we only care about a subset of projects (e.g. generally the SDK tools
-# and a few platform-specific binaries.)
-#
-# This file defines a whitelist of projects that can be built in the Windows
-# SDK case. Note that whitelisting a project directory will NOT actually build
-# it -- it will only allow one to reference it as a make dependency.
-#
-# This file is included by build/core/main.mk.
-
-# Note that there are 2 flavors of this file:
-#
-# - This file: sdk/build/windows_sdk_whitelist.mk
-#   must list all projects that are that are NOT specific to a given platform.
-#   These binaries are the ones typically found in the SDK/tools directory.
-#
-# - The other file: development/build/windows_sdk_whitelist.mk
-#   must list all projects that are specific to a given platform. These
-#   projects generate files that are generally locates in SDK/platform-tools,
-#   or SDK/platforms/, etc.
-
-# -----
-# Whitelist of SDK specific projects that do NOT need Java (e.g. C libraries)
-
-subdirs += \
-	external/boringssl \
-	external/openssl \
-#	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
-
-else
-$(warning SDK_ONLY: javac not available.)
-endif
diff --git a/find_java/Android.mk b/find_java/Android.mk
deleted file mode 100644
index ba8b5cb3d..000000000
--- a/find_java/Android.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2011 The Android Open Source Project
-#
-# Android.mk for find_java.exe & static library
-
-
-LOCAL_PATH := $(call my-dir)
-
-# find_java static library for host (used by find_java.exe and installer)
-# =======================================================================
-
-include $(CLEAR_VARS)
-
-ifeq ($(HOST_OS),windows)
-
-LOCAL_MODULE := libfindjava
-LOCAL_SRC_FILES := find_java_lib.cpp utils.cpp
-
-LOCAL_CFLAGS += -Wall -Wno-unused-parameter
-LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE -DSH_HISTORY -DUSE_MINGW
-
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-
-# "find_java.exe", to be used from android.bat & co
-# =================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-	find_java_exe.cpp
-
-LOCAL_MODULE := find_java
-LOCAL_STATIC_LIBRARIES := libfindjava
-
-LOCAL_CFLAGS += -Wall -Wno-unused-parameter
-LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE -DSH_HISTORY -DUSE_MINGW
-
-LOCAL_MODULE_TAGS := optional
-
-# Locate windres executable
-WINDRES := windres
-ifneq ($(USE_MINGW),)
-  # When building the Windows resources under Linux, use the MinGW one
-  WINDRES := i586-mingw32msvc-windres
-endif
-
-# Link the Windows icon file as well into the executable, based on the technique
-# used in external/qemu/Makefile.android.  The variables need to have different
-# names to not interfere with the ones from qemu/Makefile.android.
-#
-INTERMEDIATE         := $(call intermediates-dir-for,EXECUTABLES,$(LOCAL_MODULE),true)
-FIND_JAVA_ICON_OBJ  := find_java_icon.o
-FIND_JAVA_ICON_PATH := $(LOCAL_PATH)/images
-$(FIND_JAVA_ICON_PATH)/$(FIND_JAVA_ICON_OBJ): $(FIND_JAVA_ICON_PATH)/android_icon.rc
-	$(WINDRES) $< -I $(FIND_JAVA_ICON_PATH) -o $@
-
-# seems to be the only way to add an object file that was not generated from
-# a C/C++/Java source file to our build system. and very unfortunately,
-# $(TOPDIR)/$(LOCALPATH) will always be prepended to this value, which forces
-# us to put the object file in the source directory...
-#
-LOCAL_PREBUILT_OBJ_FILES += images/$(FIND_JAVA_ICON_OBJ)
-
-include $(BUILD_HOST_EXECUTABLE)
-
-$(call dist-for-goals,droid,$(LOCAL_BUILT_MODULE))
-
-endif
-
-
diff --git a/find_lock/Android.mk b/find_lock/Android.mk
deleted file mode 100644
index 2fd596b85..000000000
--- a/find_lock/Android.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2011 The Android Open Source Project
-#
-# Android.mk for find_lock.exe & static library
-
-
-LOCAL_PATH := $(call my-dir)
-
-# "find_lock.exe"
-# ===============
-
-include $(CLEAR_VARS)
-
-ifeq ($(HOST_OS),windows)
-
-LOCAL_SRC_FILES := \
-	find_lock.cpp \
-	find_lock_exe.cpp
-
-LOCAL_MODULE := find_lock
-LOCAL_STATIC_LIBRARIES := libfindjava
-
-LOCAL_CFLAGS += -Wall -Wno-unused-parameter
-LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE -DSH_HISTORY -DUSE_MINGW
-LOCAL_CFLAGS += -I$(TOPDIR)sdk/find_java
-
-LOCAL_MODULE_TAGS := optional
-
-# Locate windres executable
-WINDRES := windres
-ifneq ($(USE_MINGW),)
-  # When building the Windows resources under Linux, use the MinGW one
-  WINDRES := i586-mingw32msvc-windres
-endif
-
-# Link the Windows icon file as well into the executable, based on the technique
-# used in external/qemu/Makefile.android.  The variables need to have different
-# names to not interfere with the ones from qemu/Makefile.android.
-#
-INTERMEDIATE         := $(call intermediates-dir-for,EXECUTABLES,$(LOCAL_MODULE),true)
-FIND_LOCK_ICON_OBJ  := find_lock_icon.o
-FIND_LOCK_ICON_PATH := $(LOCAL_PATH)/images
-$(FIND_LOCK_ICON_PATH)/$(FIND_LOCK_ICON_OBJ): $(FIND_LOCK_ICON_PATH)/android_icon.rc
-	$(WINDRES) $< -I $(FIND_LOCK_ICON_PATH) -o $@
-
-# seems to be the only way to add an object file that was not generated from
-# a C/C++/Java source file to our build system. and very unfortunately,
-# $(TOPDIR)/$(LOCALPATH) will always be prepended to this value, which forces
-# us to put the object file in the source directory...
-#
-LOCAL_PREBUILT_OBJ_FILES += images/$(FIND_LOCK_ICON_OBJ)
-
-include $(BUILD_HOST_EXECUTABLE)
-
-$(call dist-for-goals,droid,$(LOCAL_BUILT_MODULE))
-
-endif
-
-
diff --git a/sdklauncher/Android.mk b/sdklauncher/Android.mk
deleted file mode 100644
index 3d5a98974..000000000
--- a/sdklauncher/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2009 The Android Open Source Project
-#
-# Android.mk for sdklauncher
-#
-# The "SDK Launcher" is for Windows only.
-# This simple .exe will sit at the root of the Windows SDK
-# and currently simply executes tools\android.bat.
-# Eventually it should simply replace the batch file.
-
-
-#----- The current C++ sdklauncher -----
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-ifeq ($(HOST_OS),windows)
-
-LOCAL_SRC_FILES := \
-	src/source/sdklauncher.c
-
-LOCAL_CFLAGS += -Wall -Wno-unused-parameter
-LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE -DSH_HISTORY
-LOCAL_MODULE := sdklauncher
-
-LOCAL_MODULE_TAGS := optional
-
-# Locate windres executable
-WINDRES := windres
-ifneq ($(USE_MINGW),)
-  # When building the Windows resources under Linux, use the MinGW one
-  WINDRES := i586-mingw32msvc-windres
-endif
-
-# Link the Windows icon file as well into the executable, based on the technique
-# used in external/qemu/Makefile.android.  The variables need to have different
-# names to not interfere with the ones from qemu/Makefile.android.
-#
-INTERMEDIATE     := $(call intermediates-dir-for,EXECUTABLES,$(LOCAL_MODULE),true)
-SDKLAUNCHER_ICON_OBJ := sdklauncher_icon.o
-SDKLAUNCHER_ICON_PATH := $(LOCAL_PATH)/images
-$(SDKLAUNCHER_ICON_PATH)/$(SDKLAUNCHER_ICON_OBJ): $(SDKLAUNCHER_ICON_PATH)/android_icon.rc
-	$(WINDRES) $< -I $(SDKLAUNCHER_ICON_PATH) -o $@
-
-# seems to be the only way to add an object file that was not generated from
-# a C/C++/Java source file to our build system. and very unfortunately,
-# $(TOPDIR)/$(LOCALPATH) will always be prepended to this value, which forces
-# us to put the object file in the source directory...
-#
-LOCAL_PREBUILT_OBJ_FILES += images/$(SDKLAUNCHER_ICON_OBJ)
-
-include $(BUILD_HOST_EXECUTABLE)
-
-$(call dist-for-goals,droid,$(LOCAL_BUILT_MODULE))
-
-endif
-
-
-
-