diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-22 20:59:09 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-10-22 20:59:09 -0700 |
| commit | 223f0142c5be9d9c9006d9ba8af9b3a54aa73fb6 (patch) | |
| tree | bf75fe5b4e289a20f7b8431ab8b416fce615bb5a | |
| parent | f5392475b80a9c6dfa609ee197c2f9a476240732 (diff) | |
| parent | 79949d6df58f424c1d9c6526457d5760eb3c2c83 (diff) | |
| download | external_qemu-223f0142c5be9d9c9006d9ba8af9b3a54aa73fb6.zip external_qemu-223f0142c5be9d9c9006d9ba8af9b3a54aa73fb6.tar.gz external_qemu-223f0142c5be9d9c9006d9ba8af9b3a54aa73fb6.tar.bz2 | |
Merge "Fix emulator build."
| -rw-r--r-- | Makefile.android | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.android b/Makefile.android index e5057d0..69538b7 100644 --- a/Makefile.android +++ b/Makefile.android @@ -1163,7 +1163,7 @@ LOCAL_MODULE := emulator-ui LOCAL_STATIC_LIBRARIES := emulator-uilib LOCAL_LDLIBS := $(MY_LDLIBS) -LOCAL_CFLAGS := $(MY_CFLAGS) $(LOCAL_CFLAGS) $(EMULATOR_UI_CFLAGS) +LOCAL_CFLAGS := $(MY_CFLAGS) $(LOCAL_CFLAGS) $(EMULATOR_UI_CFLAGS) $(EMULATOR_CORE_CFLAGS) # add the build ID to the default macro definitions LOCAL_CFLAGS += $(UI_AND_CORE_CFLAGS) -DCONFIG_STANDALONE_UI |