diff options
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2010-07-16 11:19:48 -0700 |
|---|---|---|
| committer | Vladimir Chtchetkine <vchtchetkine@google.com> | 2010-07-16 11:25:16 -0700 |
| commit | 2fa5173bd1ce7341c50adac676a317945f0969c7 (patch) | |
| tree | 560d67a9e25138e8139888c3ed81fb77771ce5ea /Makefile.android | |
| parent | eb8382507c6b802f378cf940fae4775633c1d84e (diff) | |
| download | external_qemu-2fa5173bd1ce7341c50adac676a317945f0969c7.zip external_qemu-2fa5173bd1ce7341c50adac676a317945f0969c7.tar.gz external_qemu-2fa5173bd1ce7341c50adac676a317945f0969c7.tar.bz2 | |
Moved dependency on android_ui_set_window_scale to ui-core-protocol.h
Also cleaned up dependency on android_base_port variable
Change-Id: I8c1675a859e3d24e9bb174471dd03556c696aff1
Diffstat (limited to 'Makefile.android')
| -rw-r--r-- | Makefile.android | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.android b/Makefile.android index 533fc2b..2eb39c4 100644 --- a/Makefile.android +++ b/Makefile.android @@ -681,8 +681,6 @@ CORE_UPSTREAM_SOURCES = json-lexer.c \ CORE_SOURCES = $(CORE_BLOCK_SOURCES) $(CORE_HW_SOURCES) CORE_SOURCES += $(CORE_MIGRATION_SOURCES) $(CORE_MISC_SOURCES) CORE_SOURCES += $(CORE_UPSTREAM_SOURCES) -# temp file used to collect UI->Core exchange protocol. -CORE_SOURCES += android/ui-core-protocol.c ############################################################################## # lists of source files used to build the emulator UI @@ -719,11 +717,15 @@ UI_AND_CORE_SOURCES = osdep.c \ android/utils/timezone.c \ android/utils/mapfile.c \ +# temp files used to collect UI->Core exchange protocol. +UI_AND_CORE_SOURCES += android/ui-core-protocol.c android/core-ui-protocol.c + ############################################################################## # now build the emulator itself # include $(CLEAR_VARS) +LOCAL_GENERATED_SOURCES := LOCAL_NO_DEFAULT_COMPILER_FLAGS := true LOCAL_CC := $(MY_CC) LOCAL_MODULE := emulator |