Merge change 24481 into eclair

* changes:
  Convert emma license info file into text format
diff --git a/Android.mk b/Android.mk
index 102f435..a553921 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,6 +1,10 @@
 # Copyright 2008 The Android Open Source Project
 
 LOCAL_PATH := $(my-dir)
+
+
+# the custom dex'ed emma library ready to put on a device.
+# ============================================================
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-java-files-under, core)
@@ -14,3 +18,17 @@
 LOCAL_NO_EMMA_INSTRUMENT := true
 
 include $(BUILD_JAVA_LIBRARY)
+
+
+
+# the custom emma library to add to an SDK project.
+# ============================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, core)
+
+LOCAL_MODULE := emmalib
+
+LOCAL_JAVA_RESOURCE_DIRS := core/res
+
+include $(BUILD_HOST_JAVA_LIBRARY)