Skip to content

Commit 51cc9af

Browse files
committed
Support: clear out some of the scripts
Remove the Docker image creation rules (Dockerfile) for the CircleCI docker image. The image has been unmaintained for long enough that it is not valuable any longer. Furthermore, with the migration to GitHub actions, the image is no longer something we need to construct as GitHub provides the image. The helper scripts that were only in use for the Docker image can also be removed. The only script here that is potentially of particular interest is the `prepare-android-ndk.py` which is, in effect, a specialised invocation of `curl`.
1 parent f08e45a commit 51cc9af

12 files changed

+3
-915
lines changed

.circleci/config.yml

-35
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,6 @@ test_step: &test_step
2828
name: Test
2929
command: cd build && ../Support/Scripts/run-${DEBUGGER-lldb}-tests.sh --log
3030

31-
check_dirty_step: &check_dirty_step
32-
run:
33-
name: Check for dirty state
34-
command: git --no-pager diff --exit-code
35-
36-
start_android_emulator_step: &start_android_emulator_step
37-
run:
38-
name: Start Android emulator
39-
command: ./Support/Scripts/start-android-emulator.py --target ${TARGET}
40-
background: true
41-
4231
build_only_defaults: &build_only_defaults
4332
<<: *docker_config
4433
steps:
@@ -54,15 +43,6 @@ build_and_test_defaults: &build_and_test_defaults
5443
- *build_step
5544
- *test_step
5645

57-
build_and_test_android: &build_and_test_android
58-
<<: *docker_config
59-
steps:
60-
- checkout
61-
- *configure_step
62-
- *build_step
63-
- *start_android_emulator_step
64-
- *test_step
65-
6646
version: 2
6747
jobs:
6848
Linux-X86-Clang:
@@ -91,18 +71,6 @@ jobs:
9171
TARGET: Linux-X86_64-Clang
9272
DEBUGGER: gdb
9373
GDB_TESTS: "gdb.base/break;gdb.base/printcmds;gdb.base/step-bt"
94-
Android-ARM:
95-
<<: *build_and_test_android
96-
environment:
97-
PLATFORM: 1
98-
TARGET: Android-ARM
99-
EXTRA_CMAKE_ARGS: "-DCMAKE_SYSTEM_VERSION=21"
100-
Android-ARM64:
101-
<<: *build_and_test_android
102-
environment:
103-
PLATFORM: 1
104-
TARGET: Android-ARM64
105-
EXTRA_CMAKE_ARGS: "-DCMAKE_SYSTEM_VERSION=24"
10674
Tizen-X86:
10775
<<: *build_only_defaults
10876
Tizen-ARM:
@@ -118,8 +86,5 @@ workflows:
11886
- Linux-X86_64-Clang-platform
11987
- Linux-X86_64-GDB
12088
- Linux-X86_64-GDB-Clang
121-
- Android-ARM
122-
- Android-ARM-16
123-
- Android-ARM64
12489
- Tizen-X86
12590
- Tizen-ARM

README.md

+3-18
Original file line numberDiff line numberDiff line change
@@ -41,30 +41,15 @@ ninja -C out
4141
### Compiling for Android
4242

4343
For Android native debugging, it is possible to build ds2 with the Android NDK.
44-
A script is provided to download the Android NDK automatically for you.
45-
46-
`Support/Scripts/prepare-android-ndk.py` will download a working version
47-
of the NDK, extract it, and install it to `/tmp/android-ndk`.
4844

4945
```sh
50-
cd ds2
51-
./Support/Scripts/prepare-android-ndk.py
52-
mkdir build && cd build
53-
cmake -DCMAKE_TOOLCHAIN_FILE=../Support/CMake/Toolchain-Android-ARM.cmake ..
54-
make
46+
cmake -B out -D CMAKE_SYSTEM_NAME=Android -D CMAKE_ANDROID_ARCH_ABI=armeabi-v7a -G Ninja -S ds2
47+
ninja -C out
5548
```
5649

5750
Note that this will build ds2 targeting the highest level API level that the
5851
NDK supports. If you want to target another api level, e.g. 21, add the flag
59-
`-DCMAKE_SYSTEM_VERSION=21` to your cmake invocation.
60-
61-
#### Testing on Android device
62-
63-
If you would like to use ds2 to run tests in the LLDB test suite using an
64-
Android device, you should use the script
65-
`Support/Scripts/prepare-android-ndk.py` to get a checkout of the android NDK.
66-
The LLDB test suite expects an NDK to exist on your host, and that script will
67-
download and unpack it where the CMake Toolchain files expect it to be.
52+
`-DCMAKE_SYSTEM_VERSION=21` to your CMake invocation.
6853

6954
### Compiling for Linux ARM
7055

Support/CMake/Toolchain-Android-ARM.cmake

-13
This file was deleted.

Support/CMake/Toolchain-Android-ARM64.cmake

-13
This file was deleted.

Support/Scripts/common.sh

-92
This file was deleted.

Support/Scripts/ds2-gdb-wrapper.sh

-14
This file was deleted.

Support/Scripts/install-android-emulator.sh

-48
This file was deleted.

Support/Scripts/prepare-android-ndk.py

-108
This file was deleted.

0 commit comments

Comments
 (0)