Move dynlink.h to include/android/
+ Move dynlink-static.c to android/
+ Move loadpng.c to android/
+ Move linux_keycodes.h to android/
Change-Id: Ibaede71e37223e86393cecc5bc86ac97ea1c97e6
diff --git a/Makefile.common b/Makefile.common
index 08e62f4..c112693 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -180,7 +180,7 @@
$(LIBPNG_CFLAGS) \
-I$(LOCAL_PATH)/$(LIBPNG_DIR)
-common_LOCAL_SRC_FILES += $(LIBPNG_SOURCES) loadpng.c
+common_LOCAL_SRC_FILES += $(LIBPNG_SOURCES) android/loadpng.c
##############################################################################
# SDL-related definitions
diff --git a/Makefile.target b/Makefile.target
index f30d73b..f981ead 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -363,7 +363,7 @@
# Note that this means no sound and graphics on Linux.
#
ifneq ($(strip $(CONFIG_STATIC_EXECUTABLE)$(BUILD_HOST_static)),)
- LOCAL_SRC_FILES += dynlink-static.c
+ LOCAL_SRC_FILES += android/dynlink-static.c
LOCAL_LDLIBS += -static
endif
@@ -446,7 +446,7 @@
# Note that this means no sound and graphics on Linux.
#
ifneq ($(strip $(CONFIG_STATIC_EXECUTABLE)$(BUILD_HOST_static)),)
- common_LOCAL_SRC_FILES += dynlink-static.c
+ common_LOCAL_SRC_FILES += android/dynlink-static.c
common_LOCAL_LDLIBS += -static
endif
diff --git a/dynlink-static.c b/android/dynlink-static.c
similarity index 100%
rename from dynlink-static.c
rename to android/dynlink-static.c
diff --git a/linux_keycodes.h b/android/linux_keycodes.h
similarity index 100%
rename from linux_keycodes.h
rename to android/linux_keycodes.h
diff --git a/loadpng.c b/android/loadpng.c
similarity index 100%
rename from loadpng.c
rename to android/loadpng.c
diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index 1cbbaa4..d7cc677 100644
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -94,7 +94,7 @@
#define DYNLINK_FUNCTIONS_INIT \
alsa_dynlink_init
-#include "dynlink.h"
+#include "android/dynlink.h"
/* these are inlined functions in the original headers */
#define FF_snd_pcm_hw_params_alloca(ptr) \
diff --git a/audio/esdaudio.c b/audio/esdaudio.c
index 84cbcb4..68df8a0 100644
--- a/audio/esdaudio.c
+++ b/audio/esdaudio.c
@@ -62,7 +62,7 @@
#define DYNLINK_FUNCTIONS_INIT \
esd_dynlink_init
-#include "dynlink.h"
+#include "android/dynlink.h"
static void* esd_lib;
diff --git a/audio/paaudio.c b/audio/paaudio.c
index c78353b..157bc8a 100644
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -38,7 +38,7 @@
static void* pa_lib;
-#include "dynlink.h"
+#include "android/dynlink.h"
typedef struct {
HWVoiceOut hw;
diff --git a/dynlink.h b/include/android/dynlink.h
similarity index 100%
rename from dynlink.h
rename to include/android/dynlink.h
