diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-07 15:54:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-07 15:54:39 -0700 |
| commit | b273b20c6052f14868d803040cc2d78b330358cb (patch) | |
| tree | d21eacefb448230b6cefda408a429fa92da6889f | |
| parent | 35003ca8aeb0d007efedc87ef0f2a9558294d4fa (diff) | |
| parent | a96c501e99bc7de068540225102854994e30cad1 (diff) | |
| download | ppp-b273b20c6052f14868d803040cc2d78b330358cb.tar.gz | |
am a96c501e: Mark ip-up-vpn as optionalandroid-sdk-tools_r12android-sdk-adt_r12
Merge commit 'a96c501e99bc7de068540225102854994e30cad1' into gingerbread-plus-aosp
* commit 'a96c501e99bc7de068540225102854994e30cad1':
Mark ip-up-vpn as optional
| -rw-r--r-- | android/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/android/Android.mk b/android/Android.mk index 25c4c58..3ab2e09 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -21,5 +21,6 @@ LOCAL_SRC_FILES := ip-up-vpn.c LOCAL_SHARED_LIBRARIES := libcutils LOCAL_MODULE := ip-up-vpn LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/ppp +LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) |