Split libcore/Android.mk into two files, one for Java code and one for
native code, and make each have a set of rules for building on the host.
I also tightened up how sub.mk processing works and documented it
a little better.
Change-Id: I8a7a4c5697b2f22c4d69941dba381d6452200911
diff --git a/JavaLibrary.mk b/JavaLibrary.mk
new file mode 100644
index 0000000..d1015f5
--- /dev/null
+++ b/JavaLibrary.mk
@@ -0,0 +1,184 @@
+# Copyright (C) 2007 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.
+
+#
+# Definitions for building the Java library and associated tests.
+#
+
+#
+# Common definitions for host and target.
+#
+
+# The core library is divided into modules. Each module has a separate
+# Java source directory, and some (hopefully eventually all) also have
+# a directory for tests.
+
+define all-core-java-files
+$(patsubst ./%,%,$(shell cd $(LOCAL_PATH) && find */src/$(1)/java -name "*.java"))
+endef
+
+# Redirect ls stderr to /dev/null because the corresponding resources
+# directories don't always exist.
+define all-core-resource-dirs
+$(shell cd $(LOCAL_PATH) && ls -d */src/$(1)/{java,resources} 2> /dev/null)
+endef
+
+# The core Java files and associated resources.
+core_src_files := $(call all-core-java-files,main)
+core_resource_dirs := $(call all-core-resource-dirs,main)
+
+# The test Java files and associated resources.
+test_src_files := $(call all-core-java-files,test)
+test_resource_dirs := $(call all-core-resource-dirs,test)
+
+
+#
+# Build for the target (device).
+#
+
+# Definitions to make the core library.
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(core_src_files)
+LOCAL_JAVA_RESOURCE_DIRS := $(core_resource_dirs)
+
+LOCAL_NO_STANDARD_LIBRARIES := true
+LOCAL_DX_FLAGS := --core-library
+
+LOCAL_NO_EMMA_INSTRUMENT := true
+LOCAL_NO_EMMA_COMPILE := true
+
+LOCAL_MODULE := core
+
+include $(BUILD_JAVA_LIBRARY)
+
+core-intermediates := ${intermediates}
+
+
+# Definitions to make the core-tests library.
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(test_src_files)
+LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
+
+LOCAL_NO_STANDARD_LIBRARIES := true
+LOCAL_JAVA_LIBRARIES := core
+LOCAL_DX_FLAGS := --core-library
+
+LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE := core-tests
+
+include $(BUILD_JAVA_LIBRARY)
+
+
+
+# This one's tricky. One of our tests needs to have a
+# resource with a "#" in its name, but Perforce doesn't
+# allow us to submit such a file. So we create it here
+# on-the-fly.
+TMP_RESOURCE_DIR := $(OUT_DIR)/tmp/
+TMP_RESOURCE_FILE := org/apache/harmony/luni/tests/java/lang/test\#.properties
+
+$(TMP_RESOURCE_DIR)$(TMP_RESOURCE_FILE):
+ @mkdir -p $(dir $@)
+ @echo "Hello, world!" > $@
+
+$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_EXTRA_JAR_ARGS := $(extra_jar_args) -C $(TMP_RESOURCE_DIR) $(TMP_RESOURCE_FILE)
+$(LOCAL_INTERMEDIATE_TARGETS): $(TMP_RESOURCE_DIR)$(TMP_RESOURCE_FILE)
+
+# Definitions for building a version of the core-tests.jar
+# that is suitable for execution on the RI. This JAR would
+# be better located in $HOST_OUT_JAVA_LIBRARIES, but it is
+# not possible to refer to that from a shell script (the
+# variable is not exported from envsetup.sh). There is also
+# some trickery involved: we need to include some classes
+# that reside in core.jar, but since we cannot incldue the
+# whole core.jar in the RI classpath, we copy those classses
+# over to our new file.
+HOST_CORE_JAR := $(HOST_COMMON_OUT_ROOT)/core-tests.jar
+
+$(HOST_CORE_JAR): PRIVATE_LOCAL_BUILT_MODULE := $(LOCAL_BUILT_MODULE)
+$(HOST_CORE_JAR): PRIVATE_CORE_INTERMEDIATES := $(core-intermediates)
+$(HOST_CORE_JAR): $(LOCAL_BUILT_MODULE)
+ @rm -rf $(dir $<)/hostctsclasses
+ $(call unzip-jar-files,$(dir $<)classes.jar,$(dir $<)hostctsclasses)
+ @unzip -qx -o $(PRIVATE_CORE_INTERMEDIATES)/classes.jar dalvik/annotation/* -d $(dir $<)hostctsclasses
+ @cp $< $@
+ @jar uf $@ -C $(dir $<)hostctsclasses .
+
+$(LOCAL_INSTALLED_MODULE): $(HOST_CORE_JAR)
+
+$(LOCAL_INSTALLED_MODULE): run-core-tests
+
+# Definitions to copy the core-tests runner script.
+
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := run-core-tests
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE := run-core-tests
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := run-core-tests-on-ri
+LOCAL_IS_HOST_MODULE := true
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE := run-core-tests-on-ri
+include $(BUILD_PREBUILT)
+
+
+#
+# Build for the host.
+#
+
+ifeq ($(WITH_HOST_DALVIK),true)
+
+ # Definitions to make the core library.
+
+ include $(CLEAR_VARS)
+
+ LOCAL_SRC_FILES := $(core_src_files)
+ LOCAL_JAVA_RESOURCE_DIRS := $(core_resource_dirs)
+
+ LOCAL_NO_STANDARD_LIBRARIES := true
+ LOCAL_DX_FLAGS := --core-library
+
+ LOCAL_NO_EMMA_INSTRUMENT := true
+ LOCAL_NO_EMMA_COMPILE := true
+
+ LOCAL_MODULE := core
+
+ include $(BUILD_HOST_JAVA_LIBRARY)
+
+
+ # Definitions to make the core-tests library.
+
+ include $(CLEAR_VARS)
+
+ LOCAL_SRC_FILES := $(test_src_files)
+ LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
+
+ LOCAL_NO_STANDARD_LIBRARIES := true
+ LOCAL_JAVA_LIBRARIES := core
+ LOCAL_DX_FLAGS := --core-library
+
+ LOCAL_MODULE_TAGS := tests
+ LOCAL_MODULE := core-tests
+
+ include $(BUILD_HOST_JAVA_LIBRARY)
+
+endif
\ No newline at end of file