aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2015-08-18 17:03:53 -0700
committerDan Willemsen <dwillemsen@google.com>2015-08-28 15:43:42 -0700
commit3f15c614fcf6abdd487ab60d167d01fbe9240f1f (patch)
treebdf42126f3eb1706bc00d41f135460eb88238732
parentb51fc0b2f99c1bd53c4c9b635d416b76eaa50838 (diff)
downloadplatform_sdk-3f15c614fcf6abdd487ab60d167d01fbe9240f1f.tar.gz
platform_sdk-3f15c614fcf6abdd487ab60d167d01fbe9240f1f.tar.bz2
platform_sdk-3f15c614fcf6abdd487ab60d167d01fbe9240f1f.zip
Remove obsolete Android.mk files
These tools no longer build under the platform build, remove the Android.mk files. Bug: 23566667 Change-Id: I433b33d0dc1944e3d6345ddd3265bc0b975327be
-rw-r--r--avdlauncher/Android.mk56
-rw-r--r--find_java/Android.mk70
-rw-r--r--find_lock/Android.mk58
-rw-r--r--sdklauncher/Android.mk59
4 files changed, 0 insertions, 243 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/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
-
-
-
-