Fix several minor errors in the build configuration.
Change-Id: I3445c97e96b8e59bd6b954dbf9ffdd2ceffd05eb
diff --git a/Android.aexec.host.mk b/Android.aexec.host.mk
index 667c2f6..20cc1ee 100644
--- a/Android.aexec.host.mk
+++ b/Android.aexec.host.mk
@@ -20,14 +20,13 @@
LOCAL_MODULE := aexec
LOCAL_MODULE_TAGS := optional
-LOCAL_CPP_EXTENSION := .cc
-
-LOCAL_SRC_FILES := src/main.cc
+include $(LOCAL_PATH)/Android.common.mk
+LOCAL_SRC_FILES := $(AEXEC_LOCAL_SRC_FILES)
LOCAL_SHARED_LIBRARIES := \
libart
LOCAL_C_INCLUDES += \
- $(LOCAL_PATH)/arc
+ $(LOCAL_PATH)/src
include $(BUILD_HOST_EXECUTABLE)
diff --git a/Android.aexec.mk b/Android.aexec.mk
index 81b02fa..59dccef 100644
--- a/Android.aexec.mk
+++ b/Android.aexec.mk
@@ -20,9 +20,8 @@
LOCAL_MODULE := aexec
LOCAL_MODULE_TAGS := optional
-LOCAL_CPP_EXTENSION := .cc
-
-LOCAL_SRC_FILES := src/main.cc
+include $(LOCAL_PATH)/Android.common.mk
+LOCAL_SRC_FILES := $(AEXEC_LOCAL_SRC_FILES)
LOCAL_SHARED_LIBRARIES := \
libart \
@@ -32,6 +31,6 @@
external/stlport/stlport \
bionic \
bionic/libstdc++/include \
- $(LOCAL_PATH)/arc
+ $(LOCAL_PATH)/src
include $(BUILD_EXECUTABLE)
diff --git a/Android.common.mk b/Android.common.mk
index daa4ab4..94a5ac8 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -14,6 +14,10 @@
# limitations under the License.
#
+LOCAL_CPP_EXTENSION := .cc
+
+AEXEC_LOCAL_SRC_FILES := \
+ src/main.cc
+
LIBART_LOCAL_SRC_FILES := \
src/art.cc
-
diff --git a/Android.libart.host.mk b/Android.libart.host.mk
index ce1adf6..a2b62ac 100644
--- a/Android.libart.host.mk
+++ b/Android.libart.host.mk
@@ -20,12 +20,11 @@
LOCAL_MODULE := libart
LOCAL_MODULE_TAGS := optional
-LOCAL_CPP_EXTENSION := .cc
-
-LOCAL_SRC_FILES += $(LIBART_LOCAL_SRC_FILES)
+include $(LOCAL_PATH)/Android.common.mk
+LOCAL_SRC_FILES := $(LIBART_LOCAL_SRC_FILES)
LOCAL_CFLAGS += \
- -g3
+ -g3 \
-Wall \
-Wextra \
-Wno-unused-parameter \
diff --git a/Android.libart.mk b/Android.libart.mk
index 072cf13..3992cf0 100644
--- a/Android.libart.mk
+++ b/Android.libart.mk
@@ -20,8 +20,7 @@
LOCAL_MODULE := libart
LOCAL_MODULE_TAGS := optional
-LOCAL_CPP_EXTENSION := .cc
-
+include $(LOCAL_PATH)/Android.common.mk
LOCAL_SRC_FILES := $(LIBART_LOCAL_SRC_FILES)
LOCAL_CFLAGS += \