Relocate all of the included Makefiles into the build subdirectory.
Change-Id: I95dc51d72ff7076efac9f04aae098038c4464f4e
diff --git a/Android.mk b/Android.mk
index ae77cd5..4290364 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,12 +17,13 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-include $(LOCAL_PATH)/Android.libart.mk
-include $(LOCAL_PATH)/Android.test.mk
-include $(LOCAL_PATH)/Android.aexec.mk
+build_path := $(LOCAL_PATH)/build
+include $(build_path)/Android.libart.mk
+include $(build_path)/Android.test.mk
+include $(build_path)/Android.aexec.mk
ifeq ($(WITH_HOST_DALVIK),true)
- include $(LOCAL_PATH)/Android.libart.host.mk
- include $(LOCAL_PATH)/Android.test.host.mk
- include $(LOCAL_PATH)/Android.aexec.host.mk
+ include $(build_path)/Android.libart.host.mk
+ include $(build_path)/Android.test.host.mk
+ include $(build_path)/Android.aexec.host.mk
endif
diff --git a/Android.aexec.host.mk b/build/Android.aexec.host.mk
similarity index 91%
rename from Android.aexec.host.mk
rename to build/Android.aexec.host.mk
index 7a59db0..a4d072e 100644
--- a/Android.aexec.host.mk
+++ b/build/Android.aexec.host.mk
@@ -14,13 +14,12 @@
# limitations under the License.
#
-LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := aexec
LOCAL_MODULE_TAGS := optional
-include $(LOCAL_PATH)/Android.common.mk
+include $(build_path)/Android.common.mk
LOCAL_SRC_FILES := $(AEXEC_LOCAL_SRC_FILES)
LOCAL_C_INCLUDES :=
diff --git a/Android.aexec.mk b/build/Android.aexec.mk
similarity index 92%
rename from Android.aexec.mk
rename to build/Android.aexec.mk
index a1707cc..2268cbf 100644
--- a/Android.aexec.mk
+++ b/build/Android.aexec.mk
@@ -14,13 +14,12 @@
# limitations under the License.
#
-LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := aexec
LOCAL_MODULE_TAGS := optional
-include $(LOCAL_PATH)/Android.common.mk
+include $(build_path)/Android.common.mk
LOCAL_SRC_FILES := $(AEXEC_LOCAL_SRC_FILES)
include external/stlport/libstlport.mk
diff --git a/Android.common.mk b/build/Android.common.mk
similarity index 100%
rename from Android.common.mk
rename to build/Android.common.mk
diff --git a/Android.libart.host.mk b/build/Android.libart.host.mk
similarity index 92%
rename from Android.libart.host.mk
rename to build/Android.libart.host.mk
index 82afc70..cd13677 100644
--- a/Android.libart.host.mk
+++ b/build/Android.libart.host.mk
@@ -14,14 +14,13 @@
# limitations under the License.
#
-LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := libart
LOCAL_MODULE_TAGS := optional
LIBART_TARGET_ARCH := $(HOST_ARCH)
-include $(LOCAL_PATH)/Android.common.mk
+include $(build_path)/Android.common.mk
LOCAL_SRC_FILES := $(LIBART_LOCAL_SRC_FILES)
LOCAL_WHOLE_STATIC_LIBRARIES := \
diff --git a/Android.libart.mk b/build/Android.libart.mk
similarity index 92%
rename from Android.libart.mk
rename to build/Android.libart.mk
index dbf42a1..404f0c6 100644
--- a/Android.libart.mk
+++ b/build/Android.libart.mk
@@ -14,14 +14,13 @@
# limitations under the License.
#
-LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := libart
LOCAL_MODULE_TAGS := optional
LIBART_TARGET_ARCH := $(TARGET_ARCH)
-include $(LOCAL_PATH)/Android.common.mk
+include $(build_path)/Android.common.mk
LOCAL_SRC_FILES := $(LIBART_LOCAL_SRC_FILES)
include external/stlport/libstlport.mk
diff --git a/Android.test.host.mk b/build/Android.test.host.mk
similarity index 95%
rename from Android.test.host.mk
rename to build/Android.test.host.mk
index dc5a053..3a07e18 100644
--- a/Android.test.host.mk
+++ b/build/Android.test.host.mk
@@ -14,13 +14,12 @@
# limitations under the License.
#
-LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
local_module_tags := eng tests
TEST_TARGET_ARCH := $(HOST_ARCH)
-include $(LOCAL_PATH)/Android.common.mk
+include $(build_path)/Android.common.mk
local_cpp_extension := $(LOCAL_CPP_EXTENSION)
local_cflags := $(LOCAL_CFLAGS)
diff --git a/Android.test.mk b/build/Android.test.mk
similarity index 95%
rename from Android.test.mk
rename to build/Android.test.mk
index 4c679ac..6121068 100644
--- a/Android.test.mk
+++ b/build/Android.test.mk
@@ -14,13 +14,12 @@
# limitations under the License.
#
-LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
local_module_tags := eng tests
TEST_TARGET_ARCH := $(TARGET_ARCH)
-include $(LOCAL_PATH)/Android.common.mk
+include $(build_path)/Android.common.mk
local_cpp_extension := $(LOCAL_CPP_EXTENSION)
local_cflags := $(LOCAL_CFLAGS)