Merge "Add LCOV handling to Emma's ANT driver/jar"
diff --git a/ANDROID-CHANGES.txt b/ANDROID-CHANGES.txt
index d4cade0..3fd8dba 100644
--- a/ANDROID-CHANGES.txt
+++ b/ANDROID-CHANGES.txt
@@ -5,4 +5,4 @@
2) Remove reference to sun.misc.* in core/java14/com/vladium/util/IJREVersion.java
3) Remove reference to sun.misc.* and SunJREExitHookManager class from core/java13/com/vladium/util/exit/ExitHookManager.java
4) Add java.security.cert.Certificate cast to core/java12/com/vladium/emma/rt/InstrClassLoader.java to fix compiler error
-5) Copy /core/res/com/vladium/emma/rt/RTExitHook.closure into source tree so it does not have to be generated in the build
+5) Move out/core/res/com/vladium/emma/rt/RTExitHook.closure (from Emma ant build) into pregenerated/ so it does not have to be generated in Android's make-based build, but also doesn't break Emma's build.
diff --git a/Android.mk b/Android.mk
index a553921..1914af7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,13 +7,13 @@
# ============================================================
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under, core)
+LOCAL_SRC_FILES := $(call all-java-files-under, core pregenerated)
LOCAL_MODULE := emma
LOCAL_MODULE_TAGS := optional
-LOCAL_JAVA_RESOURCE_DIRS := core/res
+LOCAL_JAVA_RESOURCE_DIRS := core/res pregenerated/res
LOCAL_NO_EMMA_INSTRUMENT := true
@@ -25,10 +25,10 @@
# ============================================================
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under, core)
+LOCAL_SRC_FILES := $(call all-java-files-under, core pregenerated)
LOCAL_MODULE := emmalib
-LOCAL_JAVA_RESOURCE_DIRS := core/res
+LOCAL_JAVA_RESOURCE_DIRS := core/res pregenerated/res
include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/pregenerated/ANDROID-CHANGES.txt b/pregenerated/ANDROID-CHANGES.txt
new file mode 100644
index 0000000..d4664a5
--- /dev/null
+++ b/pregenerated/ANDROID-CHANGES.txt
@@ -0,0 +1,8 @@
+This directory exists to hold the file
+pregenerated/res/com/vladium/emma/rt/RTExitHook.closure, which is normally
+deposited in the out/ directory during a standard Emma Ant build, but the
+Android make-based build doesn't accommodate source-generation.
+
+This is a hack, but it's convenient to keep Emma's own build system working
+alongside Android's make-basedsystem.
+
diff --git a/core/res/com/vladium/emma/rt/RTExitHook.closure b/pregenerated/res/com/vladium/emma/rt/RTExitHook.closure
similarity index 100%
rename from core/res/com/vladium/emma/rt/RTExitHook.closure
rename to pregenerated/res/com/vladium/emma/rt/RTExitHook.closure
