diff options
| author | Greg Hartman <ghartman@google.com> | 2018-08-17 12:43:34 -0700 |
|---|---|---|
| committer | Greg Hartman <ghartman@google.com> | 2018-08-23 17:24:52 -0700 |
| commit | 8cf8f6b088cc014921e1a9b3d4ebc93c3b5de8b8 (patch) | |
| tree | d4968732d8516f2940cfcb340bacdf7693e0ceb3 /avdlauncher/Android.mk | |
| parent | 182e4691d1c5e724fc60ed94b6de8a3356018cb6 (diff) | |
| download | device_generic_opengl-transport-8cf8f6b088cc014921e1a9b3d4ebc93c3b5de8b8.tar.gz device_generic_opengl-transport-8cf8f6b088cc014921e1a9b3d4ebc93c3b5de8b8.tar.bz2 device_generic_opengl-transport-8cf8f6b088cc014921e1a9b3d4ebc93c3b5de8b8.zip | |
distrib/android-emugl: Move Android GPU emulation sources here.
This patch is used to add the unmodified sources of the GPU
emulation libraries that are normally under sdk/emulator/opengl/.
These sources were originally built with the platform build system,
but this is no longer the case. Since they are only built through
the emulator's own build system (i.e. android-rebuild.sh), it's
easier to put them under external/qemu/ to ensure that they are
always in sync with the rest of the emulator.
Note that the encoder sources are still in the platform under
device/generic/goldfish/opengl/.
A future patch will update the emulator build system to pick
the sources from here, and another one will remove the sources
from sdk/ after that.
Note: these are the unmodified sources from the following
commit in https://android.googlesource.com/platform/sdk.git :
182e469 emulator/opengl: Fix Windows cross-build.
Change-Id: If2010577ef4af4c6755ab345f424af0b546f9282
Diffstat (limited to 'avdlauncher/Android.mk')
| -rw-r--r-- | avdlauncher/Android.mk | 56 |
1 files changed, 0 insertions, 56 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 - |