diff options
| author | Tim Baverstock <weasel@google.com> | 2010-01-20 15:43:06 +0000 |
|---|---|---|
| committer | Tim Baverstock <weasel@google.com> | 2010-01-20 15:43:06 +0000 |
| commit | ad042bb26b93e31bd7d32f3f1000bd0d791850a6 (patch) | |
| tree | c4acdc987ee567395ec7519d86482b6982af4231 | |
| parent | b5a69bd25745d7d022d38407a3f0f5cf9ca604a8 (diff) | |
| download | emma-ad042bb26b93e31bd7d32f3f1000bd0d791850a6.tar.gz | |
Change handling of the source file that Android's build can't pre-generate, so that Emma's native build system works normally.
modified: ANDROID-CHANGES.txt
modified: Android.mk
new file: pregenerated/ANDROID-CHANGES.txt
renamed: core/res/com/vladium/emma/rt/RTExitHook.closure -> pregenerated/res/com/vladium/emma/rt/RTExitHook.closure
| -rw-r--r-- | ANDROID-CHANGES.txt | 2 | ||||
| -rw-r--r-- | Android.mk | 8 | ||||
| -rw-r--r-- | pregenerated/ANDROID-CHANGES.txt | 8 | ||||
| -rw-r--r-- | pregenerated/res/com/vladium/emma/rt/RTExitHook.closure (renamed from core/res/com/vladium/emma/rt/RTExitHook.closure) | 0 |
4 files changed, 13 insertions, 5 deletions
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 @@ Change made for Android 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. @@ -7,13 +7,13 @@ LOCAL_PATH := $(my-dir) # ============================================================ 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 $(BUILD_JAVA_LIBRARY) # ============================================================ 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 index 366a00a..366a00a 100644 --- a/core/res/com/vladium/emma/rt/RTExitHook.closure +++ b/pregenerated/res/com/vladium/emma/rt/RTExitHook.closure |