From 5ef1389ebb89c25836c0cc7a1dfc1ef8ad3209a3 Mon Sep 17 00:00:00 2001 From: Anirudh Dewani Date: Tue, 3 Jul 2012 12:36:44 -0700 Subject: [PATCH 1/5] packaging the sample for SDK Change-Id: Ie398d7dfd421d7ec3de7ce58a9b9dedd532cd2db --- build/sdk.atree | 1 + 1 file changed, 1 insertion(+) diff --git a/build/sdk.atree b/build/sdk.atree index e0cf7f08e..69a70aa07 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -199,6 +199,7 @@ development/samples/VoicemailProviderDemo samples/${PLATFORM_NAME}/Voicemai development/samples/WeatherListWidget samples/${PLATFORM_NAME}/WeatherListWidget development/apps/WidgetPreview samples/${PLATFORM_NAME}/WidgetPreview development/samples/WiFiDirectDemo samples/${PLATFORM_NAME}/WiFiDirectDemo +development/samples/WiFiDirectServiceDiscovery samples/${PLATFORM_NAME}/WiFiDirectServiceDiscovery development/samples/Wiktionary samples/${PLATFORM_NAME}/Wiktionary development/samples/WiktionarySimple samples/${PLATFORM_NAME}/WiktionarySimple development/samples/XmlAdapters samples/${PLATFORM_NAME}/XmlAdapters From 3c41c70f0dbf2c9937cdf9f2b49ea8d90e9347e1 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Tue, 3 Jul 2012 14:18:52 -0700 Subject: [PATCH 2/5] Update doc package to r2. do not merge. Change-Id: Ifb87031e2b26b68e8d8c6329d5a33de04ef6681f --- sdk/doc_source.prop_template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/doc_source.prop_template b/sdk/doc_source.prop_template index d3cdfd5ee..523d6bda8 100644 --- a/sdk/doc_source.prop_template +++ b/sdk/doc_source.prop_template @@ -1,4 +1,4 @@ Pkg.UserSrc=false -Pkg.Revision=1 +Pkg.Revision=2 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} From 9649059fa0d764845d8e4ebeef17d54a6aaf8a41 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Mon, 9 Jul 2012 18:43:31 -0700 Subject: [PATCH 3/5] Prepare rev 2 of platform pkg for jb. do not merge. Change-Id: I7358b0d482df19668e75f20240fd3795870724d8 --- sdk/platform_source.prop_template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/platform_source.prop_template b/sdk/platform_source.prop_template index c6756e88a..6e5397ecd 100644 --- a/sdk/platform_source.prop_template +++ b/sdk/platform_source.prop_template @@ -2,7 +2,7 @@ Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION} Pkg.UserSrc=false Platform.Version=${PLATFORM_VERSION} Platform.CodeName=Jelly Bean -Pkg.Revision=1 +Pkg.Revision=2 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} Layoutlib.Api=8 From 51ea9221e62b147939b14ab9fe1852c3f67bec90 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Thu, 12 Jul 2012 16:14:33 -0700 Subject: [PATCH 4/5] Move SDK system image package to rev 2. Change-Id: I58be9742ccca65e72de381e07ac31e11f729a404 --- sdk/images_armeabi-v7a_source.prop_template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/images_armeabi-v7a_source.prop_template b/sdk/images_armeabi-v7a_source.prop_template index 86fc2a0bb..4f2daacd9 100644 --- a/sdk/images_armeabi-v7a_source.prop_template +++ b/sdk/images_armeabi-v7a_source.prop_template @@ -1,6 +1,6 @@ Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION} Pkg.UserSrc=false -Pkg.Revision=1 +Pkg.Revision=2 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} SystemImage.Abi=armeabi-v7a From c8b44d4ceeb110b5c836e7a3ee5a1f1ed905d975 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Fri, 13 Jul 2012 16:21:28 -0700 Subject: [PATCH 5/5] Update SDK platform-tools revision to 13. Change-Id: I0eefe31df11e31892f3574c1f8c05025b766b4e1 --- sdk/plat_tools_source.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/plat_tools_source.properties b/sdk/plat_tools_source.properties index 47d71d519..0dc837a66 100644 --- a/sdk/plat_tools_source.properties +++ b/sdk/plat_tools_source.properties @@ -1,2 +1,2 @@ Pkg.UserSrc=false -Pkg.Revision=12 \ No newline at end of file +Pkg.Revision=13 \ No newline at end of file