Skip to content

Commit 54c0e4f

Browse files
kringkring
authored
Merge pull request CesiumGS#474 from CesiumGS/restore-android-support
Restore Android support
2 parents 7b347ec + a5aade5 commit 54c0e4f

File tree

2 files changed

+52
-54
lines changed

2 files changed

+52
-54
lines changed

‎.travis.yml‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -46,54 +46,54 @@ jobs:
4646
- export PACKAGE_LINK=$(aws --region us-east-1 s3 presign s3://builds-cesium-unreal/${BUILD_CESIUM_UNREAL_PACKAGE_NAME}.zip --expires-in 315360000)
4747
- http POST "https://api.github.com/repos/${TRAVIS_REPO_SLUG}/statuses/${TRAVIS_COMMIT}" "Authorization:token ${GITHUB_TOKEN}" state=success context=plugin-package-windows "target_url=${PACKAGE_LINK}" --ignore-stdin
4848
env: PATH=/c/Python39:/c/Python39/Scripts:$PATH
49-
# - name: Android
50-
# os: windows
51-
# cache:
52-
# timeout: 1000
53-
# directories:
54-
# - /C/Program\ Files/Epic\ Games/UE_4.26
55-
# - /C/Program\ Files\ \(x86\)/Epic\ Games/Launcher
56-
# - $HOME/android-ndk-r21e
57-
# install:
58-
# - choco install 7zip.portable
59-
# - choco install python --version 3.9.2
60-
# - choco install wget
61-
# - choco install ninja
62-
# - python -m pip install --upgrade pip
63-
# - pip3 install --upgrade pip
64-
# - pip3 install awscli
65-
# - pip3 install httpie
66-
# - travis_wait 30 "./travis/travis-get-ue.sh"
67-
# - travis_wait 30 "./travis/travis-get-android-ndk.sh"
68-
# before_script:
69-
# - export ANDROID_NDK_ROOT=$HOME/android-ndk-r21e
70-
# - export NDKROOT=$ANDROID_NDK_ROOT
71-
# - export CESIUM_UNREAL_VERSION=$(git describe)
72-
# - export BUILD_CESIUM_UNREAL_PACKAGE_NAME=CesiumForUnreal-android-${CESIUM_UNREAL_VERSION}
73-
# - mkdir -p extern/build-win64
74-
# - mkdir -p extern/build-android
75-
# - cd extern/build-win64
76-
# - cmake .. -A x64
77-
# - cd ../../extern/build-android
78-
# - cmake .. -G Ninja -DCMAKE_TOOLCHAIN_FILE="unreal-android-toolchain.cmake" -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release
79-
# - cd ../..
80-
# script:
81-
# - cd extern/build-win64
82-
# - cmake --build . --config Release --target install -- /maxcpucount:4
83-
# - cd ../../extern/build-android
84-
# - cmake --build . --config Release --target install
85-
# - cd ../..
86-
# - rm -rf extern
87-
# - export CLONEDIR=$PWD
88-
# - cd /c/Program\ Files/Epic\ Games/UE_4.26/Engine/Build/BatchFiles
89-
# - ./RunUAT.bat BuildPlugin -Plugin="$CLONEDIR/CesiumForUnreal.uplugin" -Package="$CLONEDIR/../packages/CesiumForUnreal" -CreateSubFolder -TargetPlatforms=Win64+Android
90-
# - cat "C:\Users\travis\AppData\Roaming\Unreal Engine\AutomationTool\Logs\C+Program+Files+Epic+Games+UE_4.26\UBT-UE4Game-Android-Development.txt"
91-
# - cd "$CLONEDIR/../packages"
92-
# - 7z a ${BUILD_CESIUM_UNREAL_PACKAGE_NAME}.zip CesiumForUnreal/
93-
# - aws s3 cp ${BUILD_CESIUM_UNREAL_PACKAGE_NAME}.zip s3://builds-cesium-unreal/
94-
# - export PACKAGE_LINK=$(aws --region us-east-1 s3 presign s3://builds-cesium-unreal/${BUILD_CESIUM_UNREAL_PACKAGE_NAME}.zip --expires-in 315360000)
95-
# - http POST "https://api.github.com/repos/${TRAVIS_REPO_SLUG}/statuses/${TRAVIS_COMMIT}" "Authorization:token ${GITHUB_TOKEN}" state=success context=plugin-package-android "target_url=${PACKAGE_LINK}" --ignore-stdin
96-
# env: PATH=/c/Python39:/c/Python39/Scripts:$PATH
49+
- name: Android
50+
os: windows
51+
cache:
52+
timeout: 1000
53+
directories:
54+
- /C/Program\ Files/Epic\ Games/UE_4.26
55+
- /C/Program\ Files\ \(x86\)/Epic\ Games/Launcher
56+
- $HOME/android-ndk-r21e
57+
install:
58+
- choco install 7zip.portable
59+
- choco install python --version 3.9.2
60+
- choco install wget
61+
- choco install ninja
62+
- python -m pip install --upgrade pip
63+
- pip3 install --upgrade pip
64+
- pip3 install awscli
65+
- pip3 install httpie
66+
- travis_wait 30 "./travis/travis-get-ue.sh"
67+
- travis_wait 30 "./travis/travis-get-android-ndk.sh"
68+
before_script:
69+
- export ANDROID_NDK_ROOT=$HOME/android-ndk-r21e
70+
- export NDKROOT=$ANDROID_NDK_ROOT
71+
- export CESIUM_UNREAL_VERSION=$(git describe)
72+
- export BUILD_CESIUM_UNREAL_PACKAGE_NAME=CesiumForUnreal-android-${CESIUM_UNREAL_VERSION}
73+
- mkdir -p extern/build-win64
74+
- mkdir -p extern/build-android
75+
- cd extern/build-win64
76+
- cmake .. -A x64
77+
- cd ../../extern/build-android
78+
- cmake .. -G Ninja -DCMAKE_TOOLCHAIN_FILE="unreal-android-toolchain.cmake" -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release
79+
- cd ../..
80+
script:
81+
- cd extern/build-win64
82+
- cmake --build . --config Release --target install -- /maxcpucount:4
83+
- cd ../../extern/build-android
84+
- cmake --build . --config Release --target install
85+
- cd ../..
86+
- rm -rf extern
87+
- export CLONEDIR=$PWD
88+
- cd /c/Program\ Files/Epic\ Games/UE_4.26/Engine/Build/BatchFiles
89+
- ./RunUAT.bat BuildPlugin -Plugin="$CLONEDIR/CesiumForUnreal.uplugin" -Package="$CLONEDIR/../packages/CesiumForUnreal" -CreateSubFolder -TargetPlatforms=Win64+Android
90+
- cat "C:\Users\travis\AppData\Roaming\Unreal Engine\AutomationTool\Logs\C+Program+Files+Epic+Games+UE_4.26\UBT-UE4Game-Android-Development.txt"
91+
- cd "$CLONEDIR/../packages"
92+
- 7z a ${BUILD_CESIUM_UNREAL_PACKAGE_NAME}.zip CesiumForUnreal/
93+
- aws s3 cp ${BUILD_CESIUM_UNREAL_PACKAGE_NAME}.zip s3://builds-cesium-unreal/
94+
- export PACKAGE_LINK=$(aws --region us-east-1 s3 presign s3://builds-cesium-unreal/${BUILD_CESIUM_UNREAL_PACKAGE_NAME}.zip --expires-in 315360000)
95+
- http POST "https://api.github.com/repos/${TRAVIS_REPO_SLUG}/statuses/${TRAVIS_COMMIT}" "Authorization:token ${GITHUB_TOKEN}" state=success context=plugin-package-android "target_url=${PACKAGE_LINK}" --ignore-stdin
96+
env: PATH=/c/Python39:/c/Python39/Scripts:$PATH
9797
- name: MacOS
9898
os: osx
9999
osx_image: xcode11.3
@@ -166,13 +166,13 @@ jobs:
166166
- export CESIUM_UNREAL_VERSION=$(git describe)
167167
- aws s3 cp s3://builds-cesium-unreal/CesiumForUnreal-linux-${CESIUM_UNREAL_VERSION}.zip .
168168
- aws s3 cp s3://builds-cesium-unreal/CesiumForUnreal-osx-${CESIUM_UNREAL_VERSION}.zip .
169-
# - aws s3 cp s3://builds-cesium-unreal/CesiumForUnreal-android-${CESIUM_UNREAL_VERSION}.zip .
169+
- aws s3 cp s3://builds-cesium-unreal/CesiumForUnreal-android-${CESIUM_UNREAL_VERSION}.zip .
170170
- aws s3 cp s3://builds-cesium-unreal/CesiumForUnreal-windows-${CESIUM_UNREAL_VERSION}.zip .
171171
- mkdir -p build/package
172172
- cd build/package
173173
- unzip ../../CesiumForUnreal-linux-${CESIUM_UNREAL_VERSION}.zip
174174
- unzip -o ../../CesiumForUnreal-osx-${CESIUM_UNREAL_VERSION}.zip
175-
# - unzip -o ../../CesiumForUnreal-android-${CESIUM_UNREAL_VERSION}.zip
175+
- unzip -o ../../CesiumForUnreal-android-${CESIUM_UNREAL_VERSION}.zip
176176
- unzip -o ../../CesiumForUnreal-windows-${CESIUM_UNREAL_VERSION}.zip
177177
- zip -r CesiumForUnreal-${CESIUM_UNREAL_VERSION}.zip CesiumForUnreal
178178
- aws s3 cp CesiumForUnreal-${CESIUM_UNREAL_VERSION}.zip s3://builds-cesium-unreal/

‎CesiumForUnreal.uplugin‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,13 @@
2121
"Name": "CesiumRuntime",
2222
"Type": "Runtime",
2323
"LoadingPhase": "Default",
24-
"WhitelistPlatforms": [ "Win64", "Mac", "Linux" ],
25-
"BlacklistPlatforms": [ "Android" ]
24+
"WhitelistPlatforms": [ "Win64", "Mac", "Linux", "Android" ]
2625
},
2726
{
2827
"Name": "CesiumEditor",
2928
"Type": "Editor",
3029
"LoadingPhase": "PostEngineInit",
31-
"WhitelistPlatforms": [ "Win64", "Mac", "Linux" ],
32-
"BlacklistPlatforms": [ "Android" ]
30+
"WhitelistPlatforms": [ "Win64", "Mac", "Linux", "Android" ]
3331
}
3432
],
3533
"Plugins": [

0 commit comments

Comments
 (0)