Add android sdk 4.2.2.1 support to android4maven( https://sourceforge.net/projects/android4maven/ )

maven4android 4.2.2.1.diff

Index: compare.sh
===================================================================
--- compare.sh (revision 55)
+++ compare.sh	(working copy)
@@ -37,9 +37,13 @@
 #export platform=android-14
 
 # android-16
-export pomVersion=4.1.1.4
-export platform=android-16
+#export pomVersion=4.1.1.4
+#export platform=android-16
 
+# android-17
+export pomVersion=4.2.2.1
+export platform=android-17
+
 sdkJar=/opt/android-sdk-linux_86/platforms/$platform/android.jar
 sdkJarContents=$sdkJar.extracted
 
Index: extractAndroidSource.sh
===================================================================
--- extractAndroidSource.sh	(revision 55)
+++ extractAndroidSource.sh	(working copy)
@@ -60,14 +60,15 @@
 #    android-13 : not available          honeycomb (3.2)
 #    android-14 : android-4.0.1_r1.2    ice cream sandwich (4.0)
 #    android-16 : android-4.1.1_r4      jellybean (4.1)
+#    android-17 : android-4.2.2_r1      jellybean (4.2)
 #
 	
 #
 # Release name is the dessert-themed label that Google decided to market their releases under.
 #
-export releasename=jellybean-4.1
-export androidplatform=android-16
-export branchtag=android-4.1.1_r4
+export releasename=jellybean-4.2
+export androidplatform=android-17
+export branchtag=android-4.2.2_r1
 
 #
 # It was difficult to reconcile what the engineers at Google thought made great branch tags and 
@@ -91,7 +92,7 @@
 # need to go back and retro-actively release that version.  So for now, my choice and Google's 
 # happen to align :)
 #
-export pomVersion=4.1.1.4
+export pomVersion=4.2.2.1
 
 #
 # This gets fed to make to parallelize the build on multi-processor/multi-core machines.  Rob has 
@@ -236,9 +237,11 @@
 cp -r $droidFolder/frameworks/base/voip/java/* $androidImplSrcFolder/
 cp -r $droidFolder/frameworks/base/location/java/* $androidImplSrcFolder/
 cp -r $droidFolder/frameworks/ex/common/java/* $androidImplSrcFolder/
+cp -r $droidFolder/frameworks/base/opengl/java/* $androidImplSrcFolder/
+cp -r $droidFolder/frameworks/base/drm/java/* $androidImplSrcFolder/
 
-cp -r $droidFolder/packages/apps/QuickSearchBox/src/* $androidImplSrcFolder/
-cp $droidFolder/out/target/common/R/com/android/quicksearchbox/R.java $androidImplSrcFolder/com/android/quicksearchbox
+#cp -r $droidFolder/packages/apps/QuickSearchBox/src/* $androidImplSrcFolder/
+#cp $droidFolder/out/target/common/R/com/android/quicksearchbox/R.java $androidImplSrcFolder/com/android/quicksearchbox
 
 # android.* (auto-generated interfaces) and com.android.internal.*
 cp -r $frameworkOutFolder/core/java/* $androidImplSrcFolder/
@@ -262,6 +265,9 @@
 # libcore.*
 cp -r $droidFolder/libcore/luni/src/main/java/libcore $androidImplSrcFolder/
 
+# javax.*
+cp -r $droidFolder/libcore/luni/src/main/java/javax $androidImplSrcFolder/
+
 # org.kxml2.io.* (Google's org.kxml2.io.KXmlParser has keepNamespaceAttributes method that doesn't appear in 
 # net.sf.kxml:kxml2:*
 cp -r $droidFolder/libcore/xml/src/main/java/org $androidImplSrcFolder/
@@ -274,24 +280,31 @@
 cp -r $droidFolder/libcore/dalvik/src/main/java/* $androidImplSrcFolder/
 
 mkdir -p $androidImplSrcFolder/com/android/internal
+cp -r $droidFolder/out/target/common/R/android/R.java $androidImplSrcFolder/android/
 cp -r $droidFolder/out/target/common/R/com/android/internal/R.java $androidImplSrcFolder/com/android/internal
 
 cp -r $droidFolder/out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java/com $androidImplSrcFolder/
 cp -r $droidFolder/out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/location/java/* $androidImplSrcFolder/
 cp -r $droidFolder/out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/media/java/* $androidImplSrcFolder/
 cp -r $droidFolder/out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/wifi/java/* $androidImplSrcFolder/
+cp -r $droidFolder/out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/* $androidImplSrcFolder/
+cp -r $droidFolder/out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/keystore/java/* $androidImplSrcFolder/
 cp -r $droidFolder/out/target/common/obj/APPS/QuickSearchBox_intermediates/src/src/* $androidImplSrcFolder/
 cp -r $droidFolder/out/target/common/obj/APPS/framework-res_intermediates/src/android $androidImplSrcFolder/
 
 # This is org.apache.harmony and org.bouncycastle which appear to be patched versions of the same
 cp -r $droidFolder/external/bouncycastle/src/main/java/org $androidImplSrcFolder/
 
+# This is renamed package of org.bouncycastle
+mkdir -p $androidImplProjectFolder/libs/
+cp $droidFolder/out/target/common/obj/JAVA_LIBRARIES/bouncycastle_intermediates/classes-jarjar.jar $androidImplProjectFolder/libs/bouncycastle.jar
+
 # This is org.apache.http which is a patched version of httpcomponents 4.0-beta1
 cp -r $droidFolder/external/apache-http/src/org $androidImplSrcFolder/
 
 cp -r $droidFolder/external/gdata/src/* $androidImplSrcFolder/
 
-cp -r $droidFolder/external/guava/src/* $androidImplSrcFolder/
+cp -r $droidFolder/external/guava/guava/src/* $androidImplSrcFolder/
 
 # javax.annotation.*
 cp -r $droidFolder/external/jsr305/ri/src/main/java/* $androidImplSrcFolder/
@@ -302,6 +315,10 @@
 # gov.nist.javax.sip.*
 cp -r $droidFolder/external/nist-sip/java/gov $androidImplSrcFolder/
 
+# com.android.i18n.phonenumbers.*
+cp -r $droidFolder/external/libphonenumber/java/src $androidImplSrcFolder/
+
+
 find $androidImplSrcFolder -name "*.aidl" | xargs rm 
 find $androidImplSrcFolder -name "*.P" | xargs rm 
 
Index: android-impl-pom.xml
===================================================================
--- android-impl-pom.xml	(revision 55)
+++ android-impl-pom.xml	(working copy)
@@ -138,5 +138,13 @@
 		  <artifactId>json</artifactId>
 		  <version>20080701</version>
 		</dependency>
+		<dependency>
+		  <groupId>com.android</groupId>
+		  <artifactId>org.bouncycastle</artifactId>
+		  <version>r1</version>
+		  <scope>system</scope>
+		  <systemPath>${project.basedir}/libs/bouncycastle.jar</systemPath>
+		</dependency>
+		
 	</dependencies>
 </project>