Skip to content

Commit

Permalink
Fixed Android SDK 23 compiler issues, but ANE still crashes
Browse files Browse the repository at this point in the history
  • Loading branch information
neilrackett committed Dec 27, 2015
1 parent 705924a commit 97e0335
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 13 deletions.
6 changes: 3 additions & 3 deletions android/.classpath
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="lib" path="libs"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry combineaccessrules="false" kind="src" path="/android-support-v7-appcompat"/>
<classpathentry combineaccessrules="false" kind="src" path="/android-support-v7-mediarouter"/>
<classpathentry combineaccessrules="false" kind="src" path="/google-play-services_lib"/>
<classpathentry kind="lib" path="libs"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
7 changes: 2 additions & 5 deletions android/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@
android:versionName="1.0"
>

<uses-sdk
android:minSdkVersion="16"
android:targetSdkVersion="21"
/>

<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>

<application />

</manifest>
4 changes: 3 additions & 1 deletion android/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,7 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-21
target=Google Inc.:Google APIs:23
android.library=true
android.library.reference.1=C:/Program Files (x86)/Android/android-sdk/extras/android/support/v7/mediarouter
android.library.reference.2=C:/Program Files (x86)/Android/android-sdk/extras/google/google_play_services/libproject/google-play-services_lib
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public FREObject call(final FREContext context, FREObject[] args)
.addControlCategory(CastMediaControlIntent.categoryForCast(appId))
.build();

log("initialize AirCast with app ID "+appId);
log("Initialize AirCast with app ID "+appId);

activity.runOnUiThread(new Runnable()
{
Expand Down
2 changes: 2 additions & 0 deletions build/build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ adt ^
-platform Android-x86 -C android . ^
-platform iPhone-ARM -C ios . ^
-platform default -C default .

pause
2 changes: 1 addition & 1 deletion build/extension.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<extension xmlns="http://ns.adobe.com/air/extension/16.0">
<extension xmlns="http://ns.adobe.com/air/extension/20.0">

<id>com.mesmotronic.ane.aircast</id>
<versionNumber>1.0.0</versionNumber>
Expand Down
2 changes: 1 addition & 1 deletion build/ios/platform.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<platform xmlns="http://ns.adobe.com/air/extension/16.0">
<platform xmlns="http://ns.adobe.com/air/extension/20.0">
<sdkVersion>7.0</sdkVersion>
<packagedDependencies>
<packagedDependency>GoogleCast.framework</packagedDependency>
Expand Down
Binary file modified example/libs/AirCast.ane
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<application xmlns="http://ns.adobe.com/air/application/16.0">
<application xmlns="http://ns.adobe.com/air/application/20.0">

<id>com.mesmotronic.aircast.example</id>
<filename>AirCastExample</filename>
Expand Down Expand Up @@ -254,6 +254,11 @@
<!--The ACCESS_NETWORK_STATE and ACCESS_WIFI_STATE permissions should be toggled together in order to use AIR's NetworkInfo APIs-->
<!--<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>-->
<!--<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>-->
<application android:enabled="true">
<!-- <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" /> -->
</application>
</manifest>
]]></manifestAdditions>
Expand Down

0 comments on commit 97e0335

Please sign in to comment.