Merge changes Ifc818a69,I433b33d0 am: be20684665 am: 576f858aaa am: e17dd6e292android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r34android-8.0.0_r33android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devoreo-devoreo-cts-release

am: 1da8730be2

Change-Id: I8b569d223dcc896c2fdce51e92d1d4096e9d413e

1 files changed, 0 insertions, 70 deletions

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
-
-