commit 73dd5fc7da33280597dc6302ad8116d3723ebf3e
author David 'Digit' Turner <digit@android.com> Tue Feb 04 12:50:55 2014 +0100
committer David 'Digit' Turner <digit@google.com> Tue Feb 11 00:47:10 2014 +0100
tree 1e39b14a100723c4666f4a728746e1b86f5ab3de
parent 7e9f6c194a8e3e661cc89302db6690ff6835db85

Rename android/config.h to android/config-file.h

This is to avoid naming conflicts later when including
"config.h" in android/main.c to get the correct definition
of TARGET_X86 and other macros.

Change-Id: I4743bf207597721612386213208efe0c7e2f41c5

Makefile.common

diff --git a/Makefile.common b/Makefile.common
index 36cd710..46e4230 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -432,7 +432,7 @@
     android/boot-properties.c \
     android/cbuffer.c \
     android/charpipe.c \
-    android/config.c \
+    android/config-file.c \
     android/core-init-utils.c   \
     android/gps.c \
     android/hw-kmsg.c \