Move CTS Build Definitions for mmm
Doing mmm cts/tests/tests/hardware woudn't work, because make
didn't have BUILD_CTS_PACKAGE defined. Thus, move these core
CTS rules to a separate file called cts/build/config.mk, so it
can be included in the core build system. Finally, move the
other CTS build rule files into the build directory for
consistency as well.
This should make everybody happy I think...
Change-Id: I0792d0ba957ae31f79be0acbc9de8fc78e9374dc
diff --git a/CtsBuild.mk b/CtsBuild.mk
index b4273bd..d396006 100644
--- a/CtsBuild.mk
+++ b/CtsBuild.mk
@@ -14,23 +14,6 @@
LOCAL_PATH := $(call my-dir)
-# CTS build rules that are needed to generate the corresponding XML
-# for a test package. CTS needs these XML files to know what tests
-# to run as well as detect which ones were not executed.
-#
-# 1. Replace the regular build command with the CTS variant:
-#
-# BUILD_EXECUTABLE -> BUILD_CTS_EXECUTABLE
-# BUILD_PACKAGE -> BUILD_CTS_PACKAGE
-# BUILD_HOST_JAVA_LIBRARY -> BUILD_HOST_JAVA_LIBRARY
-#
-# 2. Define LOCAL_CTS_TEST_PACKAGE if you are using
-# BUILD_EXECUTABLE or BUILD_HOST_JAVA_LIBRARY.
-#
-BUILD_CTS_EXECUTABLE := $(LOCAL_PATH)/tools/build/test_executable.mk
-BUILD_CTS_PACKAGE := $(LOCAL_PATH)/tools/build/test_package.mk
-BUILD_CTS_HOST_JAVA_LIBRARY := $(LOCAL_PATH)/tools/build/test_host_java_library.mk
-
# Test XMLs, native executables, and packages will be placed in this
# directory before creating the final CTS distribution.
CTS_TESTCASES_OUT := $(HOST_OUT)/cts-testcases
diff --git a/build/config.mk b/build/config.mk
new file mode 100644
index 0000000..c9fa709
--- /dev/null
+++ b/build/config.mk
@@ -0,0 +1,17 @@
+# Copyright (C) 2012 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+BUILD_CTS_EXECUTABLE := cts/build/test_executable.mk
+BUILD_CTS_PACKAGE := cts/build/test_package.mk
+BUILD_CTS_HOST_JAVA_LIBRARY := cts/build/test_host_java_library.mk
diff --git a/tools/build/test_executable.mk b/build/test_executable.mk
similarity index 100%
rename from tools/build/test_executable.mk
rename to build/test_executable.mk
diff --git a/tools/build/test_host_java_library.mk b/build/test_host_java_library.mk
similarity index 100%
rename from tools/build/test_host_java_library.mk
rename to build/test_host_java_library.mk
diff --git a/tools/build/test_package.mk b/build/test_package.mk
similarity index 100%
rename from tools/build/test_package.mk
rename to build/test_package.mk