Clean up the rest of android stuff

Author: s1ddok

cocos2d-ext/CCClippingNode/CCClippingNode.m

@@ -83,7 +83,7 @@ - (id)initWithStencil:(CCNode *)stencil
             });
             // warn if the stencil buffer is not enabled
             if (_stencilBits <= 0) {
-#if __CC_PLATFORM_IOS || __CC_PLATFORM_ANDROID
+#if __CC_PLATFORM_IOS
                 CCLOGWARN(@"Stencil buffer is not enabled; enable it by passing GL_DEPTH24_STENCIL8_OES into the depthFormat parrameter when initializing CCGLView. Until then, everything will be drawn without stencil.");
 #elif __CC_PLATFORM_MAC
                 CCLOGWARN(@"Stencil buffer is not enabled; enable it by setting the Stencil attribue to 8 bit in the Attributes inspector of the CCGLView view object in MainMenu.xib, or programmatically by adding NSOpenGLPFAStencilSize and 8 in the NSOpenGLPixelFormatAttribute array of the NSOpenGLPixelFormat used when initializing CCGLView. Until then, everything will be drawn without stencil.");
@@ -120,44 +120,10 @@ - (void)onExit
 
 - (void)visit:(CCRenderer *)renderer parentTransform:(const GLKMatrix4 *)parentTransform
 {
-    // if stencil buffer disabled
-#if !__CC_PLATFORM_ANDROID && __CC_PLATFORM_ANDROID_FIXME
-    if (_stencilBits < 1) {
-        // draw everything, as if there where no stencil
-        [super visit:renderer parentTransform:parentTransform];
-        return;
-    }
-    
-    // return fast (draw nothing, or draw everything if in inverted mode) if:
-    // - nil stencil node
-    // - or stencil node invisible:
-    if (!_stencil || !_stencil.visible) {
-        if (_inverted) {
-            // draw everything
-            [super visit:renderer parentTransform:parentTransform];
-        }
-        return;
-    }
-#endif
-
     // store the current stencil layer (position in the stencil buffer),
     // this will allow nesting up to n CCClippingNode,
     // where n is the number of bits of the stencil buffer.
     static GLint layer = -1;
-#if !__CC_PLATFORM_ANDROID && __CC_PLATFORM_ANDROID_FIXME
-    // all the _stencilBits are in use?
-    if (layer + 1 == _stencilBits) {
-        // warn once
-        static dispatch_once_t once;
-        dispatch_once(&once, ^{
-            CCLOGWARN(@"Nesting more than %d stencils is not supported. Everything will be drawn without stencil for this node and its childs.", _stencilBits);
-        });
-        // draw everything, as if there where no stencil
-        [super visit:renderer parentTransform:parentTransform];
-        return;
-    }
-#endif
-    
     ///////////////////////////////////
     // INIT
 

cocos2d-ext/CCPackages/CCPackage.h

@@ -51,7 +51,7 @@
 @property (nonatomic, copy, readonly) NSString *resolution;
 
 /**
- *  OS of the package e.g. iOS, Android, Mac
+ *  OS of the package e.g. iOS, Mac
  *  @since v3.3 and later
  *  @see standardIdentifier
  */

cocos2d-ext/CCPackages/CCPackageHelper.h

@@ -6,7 +6,7 @@
 @interface CCPackageHelper : NSObject
 
 /**
- * Returns the current OS, possible values: `iOS` or `Android`. 
+ * Returns the current OS, possible values: `iOS`. 
  * @note On OS X this will also return `iOS`.
  * @since v3.3 and later
  */

cocos2d-ext/CCPackages/CCPackageHelper.m

@@ -8,9 +8,7 @@ @implementation CCPackageHelper
 
 + (NSString *)currentOS
 {
-#if __CC_PLATFORM_ANDROID
-    return @"Android";
-#elif __CC_PLATFORM_MAC || __CC_PLATFORM_IOS
+#if __CC_PLATFORM_MAC || __CC_PLATFORM_IOS
     return @"iOS";
 #endif
     return nil;

cocos2d-ext/CCPackages/CCPackageManager.h

@@ -82,7 +82,7 @@
  *
  *  @param name Name of the package
  *  @param resolution SpriteBuilder resolution string (ie `phonehd`)
- *  @param os operating system string (ie iOS, Android, Mac)
+ *  @param os operating system string (ie iOS, Mac)
  *  @since v3.3 and later
  *  @see CCPackage
  */

cocos2d-ext/CCParticles/CCParticleSystemBase.m

@@ -264,7 +264,7 @@ -(id) initWithDictionary:(NSDictionary *)dictionary path:(NSString*)dirname
 				NSAssert( deflated != NULL, @"CCParticleSystem: error ungzipping textureImageData");
 				NSData *data = [[NSData alloc] initWithBytes:deflated length:deflatedLen];
 
-#if __CC_PLATFORM_IOS || __CC_PLATFORM_ANDROID
+#if __CC_PLATFORM_IOS
                 BOOL png = [[[dictionary valueForKey:@"textureFileName"] lowercaseString] hasSuffix:@".png"];
                 CGDataProviderRef imgDataProvider = CGDataProviderCreateWithCFData((__bridge CFDataRef)data);
                 CGImageRef image = (png) ? CGImageCreateWithPNGDataProvider(imgDataProvider, NULL, true, kCGRenderingIntentDefault) : CGImageCreateWithJPEGDataProvider(imgDataProvider, NULL, true, kCGRenderingIntentDefault) ;

cocos2d-ext/TileMaps/CCTiledMapLayer.h

@@ -29,10 +29,6 @@
 #import "CCTMXXMLParser.h"
 #import "CCTiledMap.h"
 
-#if __CC_PLATFORM_ANDROID
-#import "CCMathTypesAndroid.h"
-#endif
-
 @class CCTiledMapInfo;
 @class CCTiledMapLayerInfo;
 @class CCTiledMapTilesetInfo;

cocos2d-ext/TileMaps/CCTiledMapLayer.m

@@ -39,7 +39,6 @@
 #import "Support/CGPointExtension.h"
 #import "CCTiledMapLayer_Private.h"
 #import "CCTexture.h"
-// #import "CCMathTypesAndroid.h"
 
 #pragma mark -
 #pragma mark CCTMXLayer

cocos2d-ui-tests/MainMenu.m

@@ -28,11 +28,7 @@
 #import "../cocos2d/CCMacros.h"
 #import <objc/runtime.h>
 
-#if __CC_PLATFORM_ANDROID
-#define kCCTestMenuItemHeight 88
-#else
 #define kCCTestMenuItemHeight 44
-#endif
 
 static CGPoint scrollPosition;
 

cocos2d-ui/CCButton.m

@@ -195,7 +195,7 @@ - (void) layout
 
     [super layout];
 }
-#if __CC_PLATFORM_IOS || __CC_PLATFORM_ANDROID
+#if __CC_PLATFORM_IOS
 
 - (void) touchEntered:(CCTouch *)touch withEvent:(CCTouchEvent *)event
 {