Skip to content

Commit f490121

Browse files
atsushienojonpryor
authored andcommitted
[Mono.Android] Android API-26 Binding (aka API-O preview 3) (#642)
Context: https://arstechnica.com/gadgets/2017/06/android-o-developer-preview-3-launches-finalizes-apis/ Context: https://arstechnica.com/gadgets/2017/06/hands-on-android-o-preview-3-is-8-0-has-a-sweet-colored-media-notification/ Google has declared that API-O Preview 3 is API-26/v8.0. Rename api-O.xml.in to api-26.xml.in, and update names accordingly. metadata fixup needs no change, though I have some other fixes (which I have been waiting for java.interop PR being merged).
1 parent 018b444 commit f490121

File tree

6 files changed

+502
-1245
lines changed

6 files changed

+502
-1245
lines changed

build-tools/android-toolchain/android-toolchain.projitems

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<HostOS>Linux</HostOS>
1616
<DestDir>build-tools\$(XABuildToolsFolder)</DestDir>
1717
</AndroidSdkItem>
18-
<AndroidSdkItem Include="platform-tools_r26.0.0-rc2-linux.zip">
18+
<AndroidSdkItem Include="platform-tools_r26.0.0-linux.zip">
1919
<HostOS>Linux</HostOS>
2020
<DestDir>platform-tools</DestDir>
2121
</AndroidSdkItem>
@@ -34,7 +34,7 @@
3434
<HostOS>Darwin</HostOS>
3535
<DestDir>build-tools\$(XABuildToolsFolder)</DestDir>
3636
</AndroidSdkItem>
37-
<AndroidSdkItem Include="platform-tools_r26.0.0-rc2-darwin.zip">
37+
<AndroidSdkItem Include="platform-tools_r26.0.0-darwin.zip">
3838
<HostOS>Darwin</HostOS>
3939
<DestDir>platform-tools</DestDir>
4040
</AndroidSdkItem>
@@ -82,21 +82,21 @@
8282
<HostOS></HostOS>
8383
<DestDir>platforms\android-22</DestDir>
8484
</AndroidSdkItem>
85-
<AndroidSdkItem Include="android-23_r01.zip">
85+
<AndroidSdkItem Include="platform-23_r03.zip">
8686
<HostOS></HostOS>
8787
<DestDir>platforms\android-23</DestDir>
8888
</AndroidSdkItem>
89-
<AndroidSdkItem Include="platform-24_r01.zip">
89+
<AndroidSdkItem Include="platform-24_r02.zip">
9090
<HostOS></HostOS>
9191
<DestDir>platforms\android-24</DestDir>
9292
</AndroidSdkItem>
93-
<AndroidSdkItem Include="platform-25_r01.zip">
93+
<AndroidSdkItem Include="platform-25_r03.zip">
9494
<HostOS></HostOS>
9595
<DestDir>platforms\android-25</DestDir>
9696
</AndroidSdkItem>
97-
<AndroidSdkItem Include="platform-O_r02.zip">
97+
<AndroidSdkItem Include="platform-26_r01.zip">
9898
<HostOS></HostOS>
99-
<DestDir>platforms\android-O</DestDir>
99+
<DestDir>platforms\android-26</DestDir>
100100
</AndroidSdkItem>
101101
<AndroidSdkItem Include="docs-24_r01.zip">
102102
<HostOS></HostOS>

build-tools/api-xml-adjuster/Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ API_XML_TOOL = $(BUILDBIN)/api-xml-adjuster.exe
1414
RUNTIME = mono
1515
RUN_CLASS_PARSE = $(RUNTIME) $(CLASS_PARSE)
1616
RUN_API_XML_TOOL = $(RUNTIME) $(API_XML_TOOL)
17-
API_LEVELS = 10 15 16 17 18 19 20 21 22 23 24 25 O
17+
API_LEVELS = 10 15 16 17 18 19 20 21 22 23 24 25 26
1818

1919
XML_OUTPUT_DIR = .
2020

@@ -72,6 +72,7 @@ DOCS_DIR_CUR_LEVEL: $(DOCS_DIR_CUR_LEVEL)
7272
# download and setup docs directory for each API profile
7373

7474
define extract-docs
75+
rm -rf $(DOCS_DIR)/$@
7576
mkdir -p $(DOCS_DIR)
7677
unzip $1 || exit 1
7778
mv $2 $@
@@ -81,10 +82,10 @@ docs-%.zip:
8182
curl -L http://dl-ssl.google.com/android/repository/$@ > $@ || exit 1
8283

8384
docs-25_web.zip:
84-
curl -L https://dl.dropboxusercontent.com/u/493047/2016/docs-25-web.zip > $@ || exit 1
85+
curl -L https://www.dropbox.com/s/x3e5e05ustyk9jb/docs-25_web.zip?dl=0 > $@ || exit 1
8586

8687
docs-O_web.zip:
87-
curl -L https://www.dropbox.com/s/35sty6h7oszc488/docs-api-O.zip?dl=0 > $@ || exit 1
88+
curl -L https://www.dropbox.com/s/8gsnkv376ylovzf/docs-api-O.zip?dl=0 > $@ || exit 1
8889

8990
# API level 10 is Android v2.3.3; it's API level 9 (Android v2.3) with a few
9091
# bugfixes which don't impact the documentation.
@@ -125,6 +126,6 @@ $(DOCS_DIR)/docs-api-24: docs-24_r01.zip
125126
$(DOCS_DIR)/docs-api-25: docs-25_web.zip # Google hadn't published docs component yet!
126127
$(call extract-docs,$<,docs)
127128

128-
$(DOCS_DIR)/docs-api-O: docs-O_web.zip # No preview docs yet
129+
$(DOCS_DIR)/docs-api-26: docs-O_web.zip # No preview docs yet
129130
$(call extract-docs,$<,docs)
130131

build-tools/scripts/BuildEverything.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ ZIP_OUTPUT = $(ZIP_OUTPUT_BASENAME).zip
1919
# $(ALL_API_LEVELS) and $(ALL_FRAMEWORKS) must be kept in sync w/ each other
2020
ALL_API_LEVELS = 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
2121
# this was different from ALL_API_LEVELS when API Level 26 was "O". Same could happen in the future.
22-
ALL_PLATFORM_IDS = 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 O
22+
ALL_PLATFORM_IDS = 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
2323
# supported api levels
24-
ALL_FRAMEWORKS = _ _ _ _ _ _ _ _ _ v2.3 _ _ _ _ v4.0.3 v4.1 v4.2 v4.3 v4.4 v4.4.87 v5.0 v5.1 v6.0 v7.0 v7.1 v7.99.0
24+
ALL_FRAMEWORKS = _ _ _ _ _ _ _ _ _ v2.3 _ _ _ _ v4.0.3 v4.1 v4.2 v4.3 v4.4 v4.4.87 v5.0 v5.1 v6.0 v7.0 v7.1 v8.0
2525
API_LEVELS = 10 15 16 17 18 19 20 21 22 23 24 25 26
2626
STABLE_API_LEVELS = 10 15 16 17 18 19 20 21 22 23 24
2727

0 commit comments

Comments
 (0)