diff options
| author | Ying Wang <wangying@google.com> | 2012-10-07 17:28:28 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-10-07 17:28:28 -0700 |
| commit | 599730cf777402d183afa5b648ea1c8c1fab8118 (patch) | |
| tree | a74ac587d0ebdfe7d6d6bcbae6d5f1dbb7edce31 | |
| parent | 7aabd796bbcb149db9ac183c1d0aec09fccd42a4 (diff) | |
| download | photoviewer-599730cf777402d183afa5b648ea1c8c1fab8118.tar.gz | |
Rename module names to avoid name conflicts.android-sdk-support_r11android-cts-4.2_r1android-4.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1jb-mr1-releasejb-mr1-dev-plus-aospjb-mr1-dev
Change-Id: Ia886d649f5f5a7ed8037c22fe3bf9d62582afd61
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | sample/Android.mk | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -15,7 +15,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := android-common-photoviewer +LOCAL_MODULE := libphotoviewer LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 diff --git a/sample/Android.mk b/sample/Android.mk index 8346e7c..96607cc 100644 --- a/sample/Android.mk +++ b/sample/Android.mk @@ -23,9 +23,9 @@ res_dirs := $(photo_dir) res include $(CLEAR_VARS) src_dirs := src -LOCAL_PACKAGE_NAME := PhotoViewerSample +LOCAL_PACKAGE_NAME := LibPhotoViewerSample -LOCAL_STATIC_JAVA_LIBRARIES += android-common-photoviewer +LOCAL_STATIC_JAVA_LIBRARIES += libphotoviewer LOCAL_STATIC_JAVA_LIBRARIES += android-common LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13 |