diff options
| author | Evan Millar <emillar@google.com> | 2009-07-08 14:58:53 -0700 |
|---|---|---|
| committer | Evan Millar <emillar@google.com> | 2009-07-08 16:46:00 -0700 |
| commit | 28f8857b1b46bde18b85c6d3c2a63ac44c3c2e1c (patch) | |
| tree | 679f09f13a62945e51cbae9f034f987520905664 /Android.mk | |
| parent | 47a99760251f02a63b1c5bb8a51c7457ee4c2626 (diff) | |
| parent | ca8172420c0913dff96ea607d477d8b8abfe5ddb (diff) | |
| download | packages_providers_ContactsProvider-28f8857b1b46bde18b85c6d3c2a63ac44c3c2e1c.zip packages_providers_ContactsProvider-28f8857b1b46bde18b85c6d3c2a63ac44c3c2e1c.tar.gz packages_providers_ContactsProvider-28f8857b1b46bde18b85c6d3c2a63ac44c3c2e1c.tar.bz2 | |
Merge commit 'goog/eclair-dev' into merge3
Merged the new contacts content provider into goog/master. The old and
new content providers now live side by side under separate authorities.
Conflicts:
Android.mk
AndroidManifest.xml
res/values/strings.xml
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -3,7 +3,8 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := user -LOCAL_SRC_FILES := $(call all-subdir-java-files) +# Only compile source java files in this apk. +LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := ext @@ -11,3 +12,6 @@ LOCAL_PACKAGE_NAME := ContactsProvider LOCAL_CERTIFICATE := shared include $(BUILD_PACKAGE) + +# Use the following include to make our test apk. +include $(call all-makefiles-under,$(LOCAL_PATH)) |