Skip to content

switch to API O preview 3. #642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 12, 2017
Merged

switch to API O preview 3. #642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions build-tools/android-toolchain/android-toolchain.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<HostOS>Linux</HostOS>
<DestDir>build-tools\$(XABuildToolsFolder)</DestDir>
</AndroidSdkItem>
<AndroidSdkItem Include="platform-tools_r26.0.0-rc2-linux.zip">
<AndroidSdkItem Include="platform-tools_r26.0.0-linux.zip">
<HostOS>Linux</HostOS>
<DestDir>platform-tools</DestDir>
</AndroidSdkItem>
Expand All @@ -34,7 +34,7 @@
<HostOS>Darwin</HostOS>
<DestDir>build-tools\$(XABuildToolsFolder)</DestDir>
</AndroidSdkItem>
<AndroidSdkItem Include="platform-tools_r26.0.0-rc2-darwin.zip">
<AndroidSdkItem Include="platform-tools_r26.0.0-darwin.zip">
<HostOS>Darwin</HostOS>
<DestDir>platform-tools</DestDir>
</AndroidSdkItem>
Expand Down Expand Up @@ -82,21 +82,21 @@
<HostOS></HostOS>
<DestDir>platforms\android-22</DestDir>
</AndroidSdkItem>
<AndroidSdkItem Include="android-23_r01.zip">
<AndroidSdkItem Include="platform-23_r03.zip">
<HostOS></HostOS>
<DestDir>platforms\android-23</DestDir>
</AndroidSdkItem>
<AndroidSdkItem Include="platform-24_r01.zip">
<AndroidSdkItem Include="platform-24_r02.zip">
<HostOS></HostOS>
<DestDir>platforms\android-24</DestDir>
</AndroidSdkItem>
<AndroidSdkItem Include="platform-25_r01.zip">
<AndroidSdkItem Include="platform-25_r03.zip">
<HostOS></HostOS>
<DestDir>platforms\android-25</DestDir>
</AndroidSdkItem>
<AndroidSdkItem Include="platform-O_r02.zip">
<AndroidSdkItem Include="platform-26_r01.zip">
<HostOS></HostOS>
<DestDir>platforms\android-O</DestDir>
<DestDir>platforms\android-26</DestDir>
</AndroidSdkItem>
<AndroidSdkItem Include="docs-24_r01.zip">
<HostOS></HostOS>
Expand Down
9 changes: 5 additions & 4 deletions build-tools/api-xml-adjuster/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ API_XML_TOOL = $(BUILDBIN)/api-xml-adjuster.exe
RUNTIME = mono
RUN_CLASS_PARSE = $(RUNTIME) $(CLASS_PARSE)
RUN_API_XML_TOOL = $(RUNTIME) $(API_XML_TOOL)
API_LEVELS = 10 15 16 17 18 19 20 21 22 23 24 25 O
API_LEVELS = 10 15 16 17 18 19 20 21 22 23 24 25 26

XML_OUTPUT_DIR = .

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

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

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

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

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

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

4 changes: 2 additions & 2 deletions build-tools/scripts/BuildEverything.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ ZIP_OUTPUT = $(ZIP_OUTPUT_BASENAME).zip
# $(ALL_API_LEVELS) and $(ALL_FRAMEWORKS) must be kept in sync w/ each other
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
# this was different from ALL_API_LEVELS when API Level 26 was "O". Same could happen in the future.
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
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
# supported api levels
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
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
API_LEVELS = 10 15 16 17 18 19 20 21 22 23 24 25 26
STABLE_API_LEVELS = 10 15 16 17 18 19 20 21 22 23 24

Expand Down
Loading