Skip to content

Commit 072c821

Browse files
marchboldmarchbold
committed
Android 64bit support
1 parent edd00e1 commit 072c821

File tree

85 files changed

+2446
-2433
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+2446
-2433
lines changed

‎.gitignore

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1+
.metadata
12
out
2-
3+
*.zip
4+
.idea/libraries
5+
.idea/workspace.xml
6+
.idea/usage.statistics.xml
7+
.idea/tasks.xml
8+
.idea/shelf

‎.idea/workspace.xml

+61-192
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,13 @@ Added isLimitAdTrackingEnabled for Android and iOS (resolves #1)
1616

1717
###### 2017.12.01 [v1.0.021]
1818

19+
```
1920
Updated documentation
21+
```
2022

2123

2224
###### 2017.12.01 [v1.0.021]
2325

26+
```
2427
Initial release
28+
```

‎build/com.distriqt.IDFA.ane

13.5 KB
Binary file not shown.

‎build_base.xml

+15-1
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@
202202
<arg line="-project ${ios.dir}/${ios.name}.xcodeproj"/>
203203
<arg line="ONLY_ACTIVE_ARCH=NO" />
204204
<arg line="BITCODE_GENERATION_MODE=bitcode" />
205+
<arg line="OTHER_CFLAGS='-fembed-bitcode'" />
205206
<arg line="-configuration ${ios.xcode_build}"/>
206207
<arg line="-alltargets" />
207208
<arg value="build"/>
@@ -214,6 +215,7 @@
214215
<arg line="-workspace ${ios.dir}/${ios.name}.xcworkspace"/>
215216
<arg line="ONLY_ACTIVE_ARCH=NO" />
216217
<arg line="BITCODE_GENERATION_MODE=bitcode" />
218+
<arg line="OTHER_CFLAGS='-fembed-bitcode'" />
217219
<arg line="-configuration ${ios.xcode_build}"/>
218220
<arg line="-scheme ${ios.name}" />
219221
<arg value="build"/>
@@ -228,6 +230,7 @@
228230
<arg line="-project ${ios.dir}/${ios.name}.xcodeproj"/>
229231
<arg line="ONLY_ACTIVE_ARCH=NO" />
230232
<arg line="BITCODE_GENERATION_MODE=bitcode" />
233+
<arg line="OTHER_CFLAGS='-fembed-bitcode'" />
231234
<arg line="-configuration ${ios.xcode_build}"/>
232235
<arg line="-alltargets" />
233236
<arg value="build" />
@@ -240,6 +243,7 @@
240243
<arg line="-workspace ${ios.dir}/${ios.name}.xcworkspace"/>
241244
<arg line="ONLY_ACTIVE_ARCH=NO" />
242245
<arg line="BITCODE_GENERATION_MODE=bitcode" />
246+
<arg line="OTHER_CFLAGS='-fembed-bitcode'" />
243247
<arg line="-configuration ${ios.xcode_build}"/>
244248
<arg line="-scheme ${ios.name}" />
245249
<arg value="build" />
@@ -466,7 +470,7 @@
466470
<unzip src="${explode_aar_file}" dest="${android.dir}/${output.tmpdir}" overwrite="true"/>
467471

468472
<copy file="${android.dir}/${output.tmpdir}/classes.jar" tofile="${android.dir}/${android.outputdir}/${explode_aar_name}.jar" />
469-
<copy includeEmptyDirs="false" overwrite="true" todir="${android.dir}/${android.outputdir}/${explode_aar_name}-res">
473+
<copy includeEmptyDirs="false" overwrite="true" todir="${android.dir}/${android.outputdir}/${explode_aar_name}-res" failonerror="false">
470474
<fileset dir="${android.dir}/${output.tmpdir}/res/" />
471475
</copy>
472476

@@ -495,17 +499,24 @@
495499
<include name="**/@{lib}.aar" />
496500
<include name="**/@{lib}.jar" />
497501
</fileset>
502+
<fileset dir="${android.dir}" id="fileset3">
503+
<include name="**/@{lib}.aar" />
504+
<include name="**/@{lib}.jar" />
505+
</fileset>
498506
<path id="aarfile">
499507
<first>
500508
<union>
501509
<resources refid="fileset1" />
502510
<resources refid="fileset2" />
511+
<resources refid="fileset3" />
503512
</union>
504513
</first>
505514
</path>
506515
<mkdir dir="${android.dir}/${output.tmpdir}" />
507516
<unzip src="${toString:aarfile}" dest="${android.dir}/${output.tmpdir}" overwrite="true"/>
517+
<copy file="${toString:aarfile}" todir="${android.dir}/${output.tmpdir}" failonerror="false" />
508518
<copy file="${android.dir}/${output.tmpdir}/classes.jar" tofile="${android.dir}/externals/@{lib}.jar" failonerror="false" />
519+
<copy file="${android.dir}/${output.tmpdir}/@{lib}.jar" tofile="${android.dir}/externals/@{lib}.jar" failonerror="false" />
509520
<copy todir="${android.dir}/externals" failonerror="false" flatten="true">
510521
<fileset dir="${android.dir}/${output.tmpdir}" >
511522
<include name="**/*.jar" />
@@ -582,12 +593,14 @@
582593
<arg line="-platform iPhone-x86 -platformoptions ./build_config/platform_ios.build.xml -C ${ios.dir}/${ios.iphonesimulator_dir} ."/>
583594
<!-- <arg line="-platform appleTV-ARM -platformoptions ./build_config/platform_tvos.build.xml -C ${ios.dir}/${ios.tvos_dir} ."/> -->
584595
<arg line="-platform Android-ARM -platformoptions ./build_config/platform_android.build.xml -C ${android.dir}/${android.outputdir} ."/>
596+
<arg line="-platform Android-ARM64 -platformoptions ./build_config/platform_android.build.xml -C ${android.dir}/${android.outputdir} ."/>
585597
<arg line="-platform Android-x86 -platformoptions ./build_config/platform_android.build.xml -C ${android.dir}/${android.outputdir} ."/>
586598
<arg line="-platform default -C ${default.dir}/bin ."/>
587599
</exec>
588600

589601
<delete file="${ios.dir}/${ios.iphoneos_dir}/library.swf" />
590602
<delete file="${ios.dir}/${ios.iphonesimulator_dir}/library.swf" />
603+
<delete file="${ios.dir}/${ios.tvos_dir}/library.swf" />
591604
<delete file="${android.dir}/${android.outputdir}/library.swf" />
592605
<delete file="${default.dir}/bin/library.swf" />
593606
</target>
@@ -773,6 +786,7 @@ _site
773786
//
774787
-->
775788

789+
776790
<target name="all" depends="clean, version, build, externals_android, package, docs" />
777791

778792
<target name="dev" depends="clean, build, package, docs" />

‎build_config/extension.xml

+7
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@
99
<finalizer>com.distriqt.extension.idfa.IDFAExtension</finalizer>
1010
</applicationDeployment>
1111
</platform>
12+
<platform name="Android-ARM64">
13+
<applicationDeployment>
14+
<nativeLibrary>distriqt.extension.idfa.android.jar</nativeLibrary>
15+
<initializer>com.distriqt.extension.idfa.IDFAExtension</initializer>
16+
<finalizer>com.distriqt.extension.idfa.IDFAExtension</finalizer>
17+
</applicationDeployment>
18+
</platform>
1219
<platform name="Android-x86">
1320
<applicationDeployment>
1421
<nativeLibrary>distriqt.extension.idfa.android.jar</nativeLibrary>

‎build_config/version.config

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#Tue, 26 Feb 2019 14:22:53 +1000
1+
#Mon, 01 Jul 2019 22:56:51 +1000
22

3-
version_major=1
4-
version_minor=1
5-
version_build=025
3+
version_major=2
4+
version_minor=0
5+
version_build=002

‎docs/asdocs/AC_OETags.js

+129-129
Original file line numberDiff line numberDiff line change
@@ -1,129 +1,129 @@
1-
////////////////////////////////////////////////////////////////////////////////
2-
//
3-
// ADOBE SYSTEMS INCORPORATED
4-
// Copyright 2008 Adobe Systems Incorporated
5-
// All Rights Reserved.
6-
//
7-
// NOTICE: Adobe permits you to use, modify, and distribute this file
8-
// in accordance with the terms of the license agreement accompanying it.
9-
//
10-
////////////////////////////////////////////////////////////////////////////////
11-
12-
13-
//v1.0
14-
function AC_AddExtension(src, ext)
15-
{
16-
if (src.indexOf('?') != -1)
17-
return src.replace(/\?/, ext+'?');
18-
else
19-
return src + ext;
20-
}
21-
22-
function AC_Generateobj(objAttrs, params, embedAttrs)
23-
{
24-
var str = '<object ';
25-
for (var i in objAttrs)
26-
str += i + '="' + objAttrs[i] + '" ';
27-
str += '>';
28-
for (var i in params)
29-
str += '<param name="' + i + '" value="' + params[i] + '" /> ';
30-
str += '<embed ';
31-
for (var i in embedAttrs)
32-
str += i + '="' + embedAttrs[i] + '" ';
33-
str += ' ></embed></object>';
34-
35-
document.write(str);
36-
}
37-
38-
function AC_FL_RunContent(){
39-
var ret =
40-
AC_GetArgs
41-
( arguments, ".swf", "movie", "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
42-
, "application/x-shockwave-flash"
43-
);
44-
AC_Generateobj(ret.objAttrs, ret.params, ret.embedAttrs);
45-
}
46-
47-
function AC_GetArgs(args, ext, srcParamName, classid, mimeType){
48-
var ret = new Object();
49-
ret.embedAttrs = new Object();
50-
ret.params = new Object();
51-
ret.objAttrs = new Object();
52-
for (var i=0; i < args.length; i=i+2){
53-
var currArg = args[i].toLowerCase();
54-
55-
switch (currArg){
56-
case "classid":
57-
break;
58-
case "pluginspage":
59-
ret.embedAttrs[args[i]] = args[i+1];
60-
break;
61-
case "src":
62-
case "movie":
63-
args[i+1] = AC_AddExtension(args[i+1], ext);
64-
ret.embedAttrs["src"] = args[i+1];
65-
ret.params[srcParamName] = args[i+1];
66-
break;
67-
case "onafterupdate":
68-
case "onbeforeupdate":
69-
case "onblur":
70-
case "oncellchange":
71-
case "onclick":
72-
case "ondblClick":
73-
case "ondrag":
74-
case "ondragend":
75-
case "ondragenter":
76-
case "ondragleave":
77-
case "ondragover":
78-
case "ondrop":
79-
case "onfinish":
80-
case "onfocus":
81-
case "onhelp":
82-
case "onmousedown":
83-
case "onmouseup":
84-
case "onmouseover":
85-
case "onmousemove":
86-
case "onmouseout":
87-
case "onkeypress":
88-
case "onkeydown":
89-
case "onkeyup":
90-
case "onload":
91-
case "onlosecapture":
92-
case "onpropertychange":
93-
case "onreadystatechange":
94-
case "onrowsdelete":
95-
case "onrowenter":
96-
case "onrowexit":
97-
case "onrowsinserted":
98-
case "onstart":
99-
case "onscroll":
100-
case "onbeforeeditfocus":
101-
case "onactivate":
102-
case "onbeforedeactivate":
103-
case "ondeactivate":
104-
case "type":
105-
case "codebase":
106-
ret.objAttrs[args[i]] = args[i+1];
107-
break;
108-
case "width":
109-
case "height":
110-
case "align":
111-
case "vspace":
112-
case "hspace":
113-
case "class":
114-
case "title":
115-
case "accesskey":
116-
case "name":
117-
case "id":
118-
case "tabindex":
119-
ret.embedAttrs[args[i]] = ret.objAttrs[args[i]] = args[i+1];
120-
break;
121-
default:
122-
ret.embedAttrs[args[i]] = ret.params[args[i]] = args[i+1];
123-
}
124-
}
125-
ret.objAttrs["classid"] = classid;
126-
if (mimeType) ret.embedAttrs["type"] = mimeType;
127-
return ret;
128-
}
129-
1+
////////////////////////////////////////////////////////////////////////////////
2+
//
3+
// ADOBE SYSTEMS INCORPORATED
4+
// Copyright 2008 Adobe Systems Incorporated
5+
// All Rights Reserved.
6+
//
7+
// NOTICE: Adobe permits you to use, modify, and distribute this file
8+
// in accordance with the terms of the license agreement accompanying it.
9+
//
10+
////////////////////////////////////////////////////////////////////////////////
11+
12+
13+
//v1.0
14+
function AC_AddExtension(src, ext)
15+
{
16+
if (src.indexOf('?') != -1)
17+
return src.replace(/\?/, ext+'?');
18+
else
19+
return src + ext;
20+
}
21+
22+
function AC_Generateobj(objAttrs, params, embedAttrs)
23+
{
24+
var str = '<object ';
25+
for (var i in objAttrs)
26+
str += i + '="' + objAttrs[i] + '" ';
27+
str += '>';
28+
for (var i in params)
29+
str += '<param name="' + i + '" value="' + params[i] + '" /> ';
30+
str += '<embed ';
31+
for (var i in embedAttrs)
32+
str += i + '="' + embedAttrs[i] + '" ';
33+
str += ' ></embed></object>';
34+
35+
document.write(str);
36+
}
37+
38+
function AC_FL_RunContent(){
39+
var ret =
40+
AC_GetArgs
41+
( arguments, ".swf", "movie", "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
42+
, "application/x-shockwave-flash"
43+
);
44+
AC_Generateobj(ret.objAttrs, ret.params, ret.embedAttrs);
45+
}
46+
47+
function AC_GetArgs(args, ext, srcParamName, classid, mimeType){
48+
var ret = new Object();
49+
ret.embedAttrs = new Object();
50+
ret.params = new Object();
51+
ret.objAttrs = new Object();
52+
for (var i=0; i < args.length; i=i+2){
53+
var currArg = args[i].toLowerCase();
54+
55+
switch (currArg){
56+
case "classid":
57+
break;
58+
case "pluginspage":
59+
ret.embedAttrs[args[i]] = args[i+1];
60+
break;
61+
case "src":
62+
case "movie":
63+
args[i+1] = AC_AddExtension(args[i+1], ext);
64+
ret.embedAttrs["src"] = args[i+1];
65+
ret.params[srcParamName] = args[i+1];
66+
break;
67+
case "onafterupdate":
68+
case "onbeforeupdate":
69+
case "onblur":
70+
case "oncellchange":
71+
case "onclick":
72+
case "ondblClick":
73+
case "ondrag":
74+
case "ondragend":
75+
case "ondragenter":
76+
case "ondragleave":
77+
case "ondragover":
78+
case "ondrop":
79+
case "onfinish":
80+
case "onfocus":
81+
case "onhelp":
82+
case "onmousedown":
83+
case "onmouseup":
84+
case "onmouseover":
85+
case "onmousemove":
86+
case "onmouseout":
87+
case "onkeypress":
88+
case "onkeydown":
89+
case "onkeyup":
90+
case "onload":
91+
case "onlosecapture":
92+
case "onpropertychange":
93+
case "onreadystatechange":
94+
case "onrowsdelete":
95+
case "onrowenter":
96+
case "onrowexit":
97+
case "onrowsinserted":
98+
case "onstart":
99+
case "onscroll":
100+
case "onbeforeeditfocus":
101+
case "onactivate":
102+
case "onbeforedeactivate":
103+
case "ondeactivate":
104+
case "type":
105+
case "codebase":
106+
ret.objAttrs[args[i]] = args[i+1];
107+
break;
108+
case "width":
109+
case "height":
110+
case "align":
111+
case "vspace":
112+
case "hspace":
113+
case "class":
114+
case "title":
115+
case "accesskey":
116+
case "name":
117+
case "id":
118+
case "tabindex":
119+
ret.embedAttrs[args[i]] = ret.objAttrs[args[i]] = args[i+1];
120+
break;
121+
default:
122+
ret.embedAttrs[args[i]] = ret.params[args[i]] = args[i+1];
123+
}
124+
}
125+
ret.objAttrs["classid"] = classid;
126+
if (mimeType) ret.embedAttrs["type"] = mimeType;
127+
return ret;
128+
}
129+

0 commit comments

Comments
 (0)