Skip to content

Commit b04200f

Browse files
committed
Revert "[Feature][Harmony] Support Harmony Platform"
This reverts commit 5e08a92.
1 parent e966790 commit b04200f

File tree

114 files changed

+8
-8409
lines changed

Some content is hidden

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

114 files changed

+8
-8409
lines changed

.gitattributes

Lines changed: 0 additions & 2 deletions
This file was deleted.

.github/actions/common-deps/action.yml

Lines changed: 0 additions & 64 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -235,86 +235,6 @@ jobs:
235235
./xctestrunner --xctestrun `pwd`/Build/Products/DebugRouter_Tests_iphonesimulator$(cat sdk.txt)-arm64.xctestrun --work_dir `pwd` --output_dir `pwd`/iOSCoreBuild/DerivedData simulator_test
236236
popd
237237
238-
harmony-har-build:
239-
runs-on: lynx-custom-dind
240-
container:
241-
image: ghcr.io/lynx-family/ubuntu24.04-harmony:lastest
242-
options: --cap-add=NET_ADMIN
243-
credentials:
244-
username: lynx-family
245-
password: ${{ secrets.GITHUB_TOKEN }}
246-
steps:
247-
- name: Set MTU
248-
run: |
249-
sudo apt-get update && sudo apt-get install --no-install-recommends -y iproute2
250-
sudo ip link set dev eth0 mtu 1450
251-
echo "MTU set successfully"
252-
- name: Python Setup
253-
uses: actions/setup-python@v5
254-
with:
255-
python-version: "3.13"
256-
- name: Install Rust toolchain
257-
uses: actions-rs/toolchain@v1
258-
with:
259-
toolchain: stable
260-
profile: minimal
261-
override: true
262-
- name: Download Source
263-
uses: actions/checkout@v4.2.2
264-
- name: Install Common Dependencies
265-
uses: ./.github/actions/common-deps
266-
- name: Build har
267-
shell: bash
268-
run: |
269-
PROJECT_ROOT=$(pwd)
270-
pushd test/e2e_test/harmony_example
271-
ohpm install
272-
./script/build.py --build_har --modules debug_router --verbose
273-
popd
274-
pushd debug_router/harmony/debug_router/build/default/outputs/default
275-
ls -al
276-
popd
277-
278-
harmony-hap-build:
279-
runs-on: lynx-custom-dind
280-
container:
281-
image: ghcr.io/lynx-family/ubuntu24.04-harmony:lastest
282-
options: --cap-add=NET_ADMIN
283-
credentials:
284-
username: lynx-family
285-
password: ${{ secrets.GITHUB_TOKEN }}
286-
steps:
287-
- name: Set MTU
288-
run: |
289-
sudo apt-get update && sudo apt-get install --no-install-recommends -y iproute2
290-
sudo ip link set dev eth0 mtu 1450
291-
echo "MTU set successfully"
292-
- name: Python Setup
293-
uses: actions/setup-python@v5
294-
with:
295-
python-version: "3.13"
296-
- name: Install Rust toolchain
297-
uses: actions-rs/toolchain@v1
298-
with:
299-
toolchain: stable
300-
profile: minimal
301-
override: true
302-
- name: Download Source
303-
uses: actions/checkout@v4.2.2
304-
- name: Install Common Dependencies
305-
uses: ./.github/actions/common-deps
306-
- name: Build hap
307-
shell: bash
308-
run: |
309-
PROJECT_ROOT=$(pwd)
310-
pushd test/e2e_test/harmony_example
311-
ohpm install
312-
./script/build.py --build_hap --is_debug --modules debug_router --verbose
313-
popd
314-
pushd test/e2e_test/harmony_example/entry/build/default/outputs/default
315-
ls -al
316-
popd
317-
318238
debug-router-connector-npm-package-build:
319239
runs-on: lynx-ubuntu-22.04-avd-large
320240
steps:

.github/workflows/harmony-release.yml

Lines changed: 0 additions & 74 deletions
This file was deleted.

.gitignore

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# Android build cache
44
debug_router/android/debug_router/build
55
debug_router/android/debug_router/.cxx
6-
debug_router/android/debug_router/.gradle
76
test/e2e_test/android_example/local.properties
87

98
# export files, copy from DebugRouter task
@@ -12,47 +11,23 @@ debug_router/android/debug_router/src/main/export
1211
# xx_jni.h files generated by build_jni
1312
debug_router/android/build/gen
1413

15-
# harmony part
16-
debug_router/harmony/.hvigor
17-
debug_router/harmony/.idea
18-
debug_router/harmony/oh_modules
19-
debug_router/harmony/.clang-format
20-
21-
# cpp gn artifacts
22-
out/
23-
2414
### debug_router_connector part
2515
debug_router_connector/node_modules
2616
debug_router_connector/dist
2717

2818
### test part
2919
test/e2e_test/android_/*.iml
30-
test/e2e_test/android_example/.gradle
20+
test/e2e_test/android_example/.gradle/*
3121
test/e2e_test/android_example/build
3222
test/e2e_test/android_example/app/build
33-
test/e2e_test/android_example/local.properties
3423

3524
test/e2e_test/connector_test/node_modules
3625

3726
test/e2e_test/ios_example/DebugRouter.xcworkspace
3827
test/e2e_test/ios_example/Pods
3928
test/e2e_test/ios_example/xctestrunner
4029

41-
test/e2e_test/harmony_example/entry/libs/**/*.so
42-
test/e2e_test/harmony_example/entry/.cxx
43-
test/e2e_test/harmony_example/.clang-format
44-
45-
# tools file
46-
tools/android_tools/
47-
4830
# .DS_Store files
4931
**/.DS_Store
5032

51-
# other part
52-
**/oh_modules
53-
**/build
54-
**/.hvigor
55-
**/oh-package-lock.json5
56-
**/.idea
57-
**/.cxx
5833

BUILD.gn

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
group("root") {
22
testonly = true
33
deps = [
4-
"//debug_router/harmony:harmony",
54
"//debug_router/native/test:example_unittest",
65
]
7-
}
6+
}

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ deps = {
3737
'build': {
3838
"type": "git",
3939
"url": "https://github.com/lynx-family/buildroot.git",
40-
"commit": "79446975604356f28b44c4e67851b3c9aafa372f",
40+
"commit": "b74a2ad3759ed710e67426eb4ce8e559405ed63f",
4141
"ignore_in_git": True,
4242
"condition": system in ['linux', 'darwin', 'windows']
4343
},

DebugRouter.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
2828
s.subspec 'Native' do |ss|
2929
ss.header_mappings_dir = "."
3030
ss.source_files = 'debug_router/native/**/*'
31-
ss.exclude_files = 'debug_router/native/android/**/*','debug_router/native/test/*','debug_router/native/socket/win/*', 'debug_router/native/harmony/**/*'
31+
ss.exclude_files = 'debug_router/native/android/**/*','debug_router/native/test/*','debug_router/native/socket/win/*'
3232
ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"${PODS_TARGET_SRCROOT}\" \"${PODS_TARGET_SRCROOT}/third_party/jsoncpp/include\""}
3333
ss.dependency 'DebugRouter/third_party'
3434
ss.private_header_files = 'debug_router/native/**/*.{h}'

README.md

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ Let's introduce how to quickly get started with DebugRouter. For detailed integr
3131

3232
#### Android
3333
``` bash
34-
# export ANDROID_HOME and ANDROID_NDK first
3534
cd test/e2e_test/android_example
3635
./gradlew app:assembleDebug
3736
```
@@ -47,20 +46,6 @@ bundle install && bundle exec pod install
4746
- Connect your mobile phone to your Mac using a USB cable.
4847
- Use Xcode to build and install DebugRouterExample to your phone.
4948

50-
### Harmony
51-
52-
```bash
53-
# export HARMONY_HOME and ohpm path first
54-
nvm use 18
55-
source tools/envsetup.sh --target harmony
56-
tools/hab sync . -f --no-history --target harmony
57-
58-
cd test/e2e_test/harmony_example
59-
60-
ohpm run prepare
61-
```
62-
63-
- Open DevEco-Studio and build && install HarmonyExample
6449

6550
### Run debug_router_connector
6651
Compile debug_router_connector

config.gni

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ if (is_android) {
44
import("//build/config/android/config.gni")
55
}
66

7-
if (is_harmony) {
8-
import("//build/config/harmony/config.gni")
9-
}
10-
117
if (target_cpu == "arm" || target_cpu == "arm64") {
128
import("//build/config/arm.gni")
139
}

0 commit comments

Comments
 (0)