Skip to content

chore(shared): drop the dead OHOS source set and HarmonyOS mentions in code - #3377

Merged
stamp-build[bot] merged 1 commit into
mainfrom
agent/codex-android-devops/code-drop-harmonyos
Oct 21, 2026
Merged

stamp-build[bot] merged 1 commit into
mainfrom
agent/codex-android-devops/code-drop-harmonyos

Conversation

@stamp-build

@stamp-build stamp-build Bot commented Oct 21, 2026

Copy link
Copy Markdown
Contributor

林舟 (Codex-Android-DevOPS) from slock-android opened this pull request through Stamp
View in Stamp →


Summary

This is the third HarmonyOS cleanup PR, after #3371 (docs) and #3373 (CI/scripts). It removes the last HarmonyOS/OHOS parts from compose/**. It is done on artin's instruction ("鸿蒙部分都删了": remove all the HarmonyOS parts). No behaviour change: the only non-comment edits are three strings on internal smoke/diagnostic screens.

Dead source set

  • Deleted compose/shared/src/ohosArm64Main/ (only RaftStoreConfinement.ohos.kt). No Gradle file, buildSrc or gradle.properties references ohosArm64* or the source set; the remaining actuals are in :core androidMain/iosMain.

HarmonyOS literals (internal smoke/diagnostic pages)

  • SettingsHomePage.kt: "Harmony smoke preview" becomes "Shared tab bar smoke preview", and the settingsTabBarSmokePayload subtitle "Harmony smoke" becomes "Tab bar smoke".
  • RaftLucideIconGalleryPage.kt: "${names.size} icons · generated OHOS paths" becomes "… · generated vector paths".

i18n scanner now passes on the whole repo

  • scripts/i18n_code_literal_allowlist.json: removed five stale entries. One was "Floating Dock", whose literal no longer exists. The other four ("MENU ACTION", "MODAL ACTION", "UNDERLAY HIT", "CURSOR MOVED") belong to pages that moved to src/visualFixtures, which the scanner excludes. Added reviewed exceptions for the two renamed smoke/gallery literals.
  • python3 scripts/i18n_code_literal_scan.py now exits 0 (805 files, 1587 advisory findings, 29 reviewed exceptions). Before, it raised on stale entries.

Comments

  • About 60 comment/KDoc rewrites in compose/shared, compose/core, compose/androidApp, compose/iosApp (ObjC/Swift) and compose/gradle.properties. They drop OHOS/HarmonyOS/ArkTS from platform lists, or reword them to Android/iOS where the comment still describes current cross-platform behaviour. Examples: the shared 50MB feedback cap, native string-lookup and template resolution, and coroutines-test-free commonTest.

Intentionally left (not comments, or still accurate)

  • Test data and test names in commonTest: "OHOS Phone"/"HarmonyOS" labels, the raft-ohos release-notes slug, the os in setOf("android","ios","ohos") assertion, ohos* test method names and fixture ids, and the .hap file-name fixture. Changing these is a test-code edit, not a comment cleanup.
  • RaftModuleCompat.ExecuteMode.OHOS_NATIVE(4): an enum/wire value.
  • The visual fixture message text in ThreadMessageRowVisualFixtures.kt:1367. Changing it would change goldens.
  • AndroidPushRegistration.kt / RaftPlayServicesAvailability.kt mention "HarmonyOS's Android compatibility layer". That is about Huawei devices running the Android app, which is still relevant.
  • THIRD_PARTY_NOTICES.md, to be handled in a separate notices refresh.

Checks

  • Android compile: ./gradlew :shared:compileDebugKotlinAndroid :core:compileAndroidMain (through the shared build-slot wrapper): BUILD SUCCESSFUL
  • python3 scripts/i18n_code_literal_scan.py (json and markdown): exit 0
  • scripts/qa/test_i18n_code_literal_scan.py: 18 OK
  • scripts/ci/check_source_constraints.py (--self-test and real run), check_string_edge_spaces.py, verify_no_production_visual_pages.py, visual_fixture_split_census.py, test_kuikly_raft_consumer_contract.py, scripts/check_slock_source_path_contract.sh: all pass
  • Non-comment diff in compose/** is limited to the three literals above (checked with git diff -U0, filtering comment lines).

🤖 Generated with Claude Code

…n code

HarmonyOS was removed in #3181; this clears what was left in compose/**.

- Delete compose/shared/src/ohosArm64Main (no target compiles it; no
  Gradle config references it).
- Replace the "Harmony smoke" / "generated OHOS paths" labels on internal
  smoke and icon-gallery pages with platform-neutral text.
- i18n allowlist: drop five stale entries ("Floating Dock" and four
  literals whose pages moved to visualFixtures) and re-review the two
  renamed labels, so the scanner passes on the whole repo again.
- Reword OHOS/HarmonyOS/ArkTS comments to Android/iOS or drop them.
  Comments only; no behaviour change.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@stamp-build
stamp-build Bot force-pushed the agent/codex-android-devops/code-drop-harmonyos branch from af00dc3 to c14fb4d Compare October 21, 2026 05:09
@stamp-build
stamp-build Bot merged commit f78c2bc into main Oct 21, 2026
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

0 participants