aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.android
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.android')
-rw-r--r--Makefile.android8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.android b/Makefile.android
index 3b1619b..01cb35b 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -149,17 +149,17 @@ start-emulator-library = \
$(eval LOCAL_LDLIBS := $(MY_LDLIBS)) \
$(eval LOCAL_MODULE_TAGS := debug) \
$(eval LOCAL_MODULE := $1) \
+ $(eval LOCAL_MODULE_CLASS := STATIC_LIBRARIES)
# Used with start-emulator-library
end-emulator-library = \
- $(eval include $(BUILD_HOST_STATIC_LIBRARY)) \
- $(eval EMULATOR_MODULE_TYPE := STATIC_LIBRARY)
+ $(eval include $(BUILD_HOST_STATIC_LIBRARY))
# A variant of start-emulator-library to start the definition of a host
# program instead. Use with end-emulator-program
start-emulator-program = \
$(call start-emulator-library,$1) \
- $(eval EMULATOR_MODULE_TYPE := EXECUTABLES)
+ $(eval LOCAL_MODULE_CLASS := EXECUTABLES)
# A varient of end-emulator-library for host programs instead
end-emulator-program = \
@@ -251,6 +251,8 @@ LOCAL_SRC_FILES := \
android/protocol/core-commands-proxy.c \
android/protocol/user-events-proxy.c \
+$(call gen-hw-config-defs,android/main-common.c)
+
LOCAL_SRC_FILES += $(SDLMAIN_SOURCES)
LOCAL_STATIC_LIBRARIES += $(SDL_STATIC_LIBRARIES)