Page MenuHomePhabricator
Differential D4433

[android] Fix android CI + build with CMake changes
AbandonedPublicDraft
Actions

Authored by • jon on Jul 3 2022, 10:41 AM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Mar 25, 6:08 PM
Unknown Object (File)
Tue, Mar 18, 7:27 AM
Unknown Object (File)
Sun, Mar 16, 3:11 PM
Unknown Object (File)
Sun, Mar 16, 8:38 AM
Unknown Object (File)
Sun, Mar 16, 8:38 AM
Unknown Object (File)
Tue, Mar 11, 4:20 PM
Unknown Object (File)
Mon, Mar 10, 7:29 PM
Unknown Object (File)
Sat, Mar 8, 11:38 PM
View All Files
Subscribers
• abosh
• adrian
ashoat
atul
tomek

Details

Reviewers
ashoat
• max
• karol
Summary

Update android build to re-use comm cmake projects

Depends on D4432

Test Plan

cd native/android && ./gradlew bundleRelease

Diff Detail

Repository
rCOMM Comm
Branch
joringer/add-nix-clean (branched from master)
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

• jon created this revision.Jul 3 2022, 10:41 AM
Herald added subscribers: • abosh, atul, • adrian and 2 others. · View Herald TranscriptJul 3 2022, 10:41 AM
• jon edited the summary of this revision. (Show Details)Jul 3 2022, 10:42 AM
• jon added a parent revision: D4432: [nix] Add fbjni.
• jon edited the test plan for this revision. (Show Details)
• jon updated this revision to Diff 14125.Jul 3 2022, 10:44 AM
• jon edited the summary of this revision. (Show Details)

Remove androidDevEnv from dev shell

There's currently no way to accept the ndk and patcher
licenses which makes it unusable for now.

• jon updated this revision to Diff 14126.Jul 3 2022, 10:46 AM

Remove explicit includes directories

Should be available through CMake targets

• jon added reviewers: ashoat, • max, • karol.Jul 3 2022, 10:50 AM
Harbormaster failed remote builds in B10235: Diff 14124!Jul 3 2022, 10:51 AM
Harbormaster failed remote builds in B10236: Diff 14125!Jul 3 2022, 10:54 AM
Harbormaster returned this revision to the author for changes because remote builds failed.Jul 3 2022, 10:56 AM
Harbormaster failed remote builds in B10237: Diff 14126!
• jon updated this revision to Diff 14195.Jul 5 2022, 9:25 AM

Stash attempt to do canonical cmake build

Harbormaster returned this revision to the author for changes because remote builds failed.Jul 5 2022, 9:32 AM
Harbormaster failed remote builds in B10297: Diff 14195!
• jon mentioned this in D4448: Update android build with cmake changes.Jul 5 2022, 11:58 AM
• jon abandoned this revision.Jul 5 2022, 12:03 PM

Going to abandon to avoid it polluting the backlog.

Unresolved issues:

  • Demand to target cross compilation requires the sources files to be present, so we can't really use native pre-built nix packages
  • Nixpkgs' android-sdk.composeSdk doesn't really support agreeing to the ndk and patch licenses.
  • Android uses a patched version of cmake 3.10 which makes importing sibling projects impossible

Future work:

  • Support nixpkgs to auto-generate the ndk license in the expected location
  • Use cmake 3.21+ which supports android toolchain files natively
• jon mentioned this in D4483: [Nix] Support building Android through gradle on Linux.Jul 7 2022, 4:15 PM
• jon mentioned this in D3640: Add Android to Nix.Jul 13 2022, 12:31 PM
• jon mentioned this in rCOMM0cb68e57850f: Update android build with cmake changes.Jul 20 2022, 3:18 PM
• jon mentioned this in rCOMM7726e8c8e6d1: [Nix] Support building Android through gradle on Linux.Jul 29 2022, 10:03 AM

Revision Contents
Changeset List

PathSize
1 line
native/
android/
app/
23 lines
nix/
33 lines
17 lines
1 line
9 lines
54 lines

Diff 14125

View Options

flake.nix

Show First 20 Lines • Show All 76 Lines • ▼ Show 20 Lines "dependencies": {
"sharp": "^0.30.5", "sharp": "^0.30.5",
"siwe": "^1.1.6", "siwe": "^1.1.6",
"sql-template-strings": "^2.2.2", "sql-template-strings": "^2.2.2",
"stream-combiner": "^0.2.2", "stream-combiner": "^0.2.2",
"tcomb": "^3.2.29", "tcomb": "^3.2.29",
"twin-bcrypt": "^2.1.1", "twin-bcrypt": "^2.1.1",
"uuid": "^3.3.3", "uuid": "^3.3.3",
"web": "0.0.1", "web": "0.0.1",
"web-push": "^3.5.0" "web-push": "^3.5.0",
"ws": "^8.13.0"
ashoatUnsubmitted
Done
Inline Actions

Realizing this will change the version of ws that is imported here. In fact we're already importing a newer version (7.5.9) than our version of express-ws uses (5.2.3), but it looks like we only use it for Flow types so it's okay

ashoat: Realizing this will change the version of `ws` that is imported [here](https://github.
}, },
"optionalDependencies": { "optionalDependencies": {
"bufferutil": "^4.0.5", "bufferutil": "^4.0.5",
"utf-8-validate": "^5.0.7" "utf-8-validate": "^5.0.7"
}, },
"nodemonConfig": { "nodemonConfig": {
"delay": "200" "delay": "200"
}, },
Show All 15 Lines
View Options

native/android/app/CMakeLists.txt

Show First 20 Lines • Show All 76 Lines • ▼ Show 20 Lines "dependencies": {
"sharp": "^0.30.5", "sharp": "^0.30.5",
"siwe": "^1.1.6", "siwe": "^1.1.6",
"sql-template-strings": "^2.2.2", "sql-template-strings": "^2.2.2",
"stream-combiner": "^0.2.2", "stream-combiner": "^0.2.2",
"tcomb": "^3.2.29", "tcomb": "^3.2.29",
"twin-bcrypt": "^2.1.1", "twin-bcrypt": "^2.1.1",
"uuid": "^3.3.3", "uuid": "^3.3.3",
"web": "0.0.1", "web": "0.0.1",
"web-push": "^3.5.0" "web-push": "^3.5.0",
"ws": "^8.13.0"
ashoatUnsubmitted
Done
Inline Actions

Realizing this will change the version of ws that is imported here. In fact we're already importing a newer version (7.5.9) than our version of express-ws uses (5.2.3), but it looks like we only use it for Flow types so it's okay

ashoat: Realizing this will change the version of `ws` that is imported [here](https://github.
}, },
"optionalDependencies": { "optionalDependencies": {
"bufferutil": "^4.0.5", "bufferutil": "^4.0.5",
"utf-8-validate": "^5.0.7" "utf-8-validate": "^5.0.7"
}, },
"nodemonConfig": { "nodemonConfig": {
"delay": "200" "delay": "200"
}, },
Show All 15 Lines
View Options

nix/android-dev-env.nix

Show First 20 Lines • Show All 76 Lines • ▼ Show 20 Lines "dependencies": {
"sharp": "^0.30.5", "sharp": "^0.30.5",
"siwe": "^1.1.6", "siwe": "^1.1.6",
"sql-template-strings": "^2.2.2", "sql-template-strings": "^2.2.2",
"stream-combiner": "^0.2.2", "stream-combiner": "^0.2.2",
"tcomb": "^3.2.29", "tcomb": "^3.2.29",
"twin-bcrypt": "^2.1.1", "twin-bcrypt": "^2.1.1",
"uuid": "^3.3.3", "uuid": "^3.3.3",
"web": "0.0.1", "web": "0.0.1",
"web-push": "^3.5.0" "web-push": "^3.5.0",
"ws": "^8.13.0"
ashoatUnsubmitted
Done
Inline Actions

Realizing this will change the version of ws that is imported here. In fact we're already importing a newer version (7.5.9) than our version of express-ws uses (5.2.3), but it looks like we only use it for Flow types so it's okay

ashoat: Realizing this will change the version of `ws` that is imported [here](https://github.
}, },
"optionalDependencies": { "optionalDependencies": {
"bufferutil": "^4.0.5", "bufferutil": "^4.0.5",
"utf-8-validate": "^5.0.7" "utf-8-validate": "^5.0.7"
}, },
"nodemonConfig": { "nodemonConfig": {
"delay": "200" "delay": "200"
}, },
Show All 15 Lines
View Options

nix/dev-shell.nix

Show First 20 Lines • Show All 76 Lines • ▼ Show 20 Lines "dependencies": {
"sharp": "^0.30.5", "sharp": "^0.30.5",
"siwe": "^1.1.6", "siwe": "^1.1.6",
"sql-template-strings": "^2.2.2", "sql-template-strings": "^2.2.2",
"stream-combiner": "^0.2.2", "stream-combiner": "^0.2.2",
"tcomb": "^3.2.29", "tcomb": "^3.2.29",
"twin-bcrypt": "^2.1.1", "twin-bcrypt": "^2.1.1",
"uuid": "^3.3.3", "uuid": "^3.3.3",
"web": "0.0.1", "web": "0.0.1",
"web-push": "^3.5.0" "web-push": "^3.5.0",
"ws": "^8.13.0"
ashoatUnsubmitted
Done
Inline Actions

Realizing this will change the version of ws that is imported here. In fact we're already importing a newer version (7.5.9) than our version of express-ws uses (5.2.3), but it looks like we only use it for Flow types so it's okay

ashoat: Realizing this will change the version of `ws` that is imported [here](https://github.
}, },
"optionalDependencies": { "optionalDependencies": {
"bufferutil": "^4.0.5", "bufferutil": "^4.0.5",
"utf-8-validate": "^5.0.7" "utf-8-validate": "^5.0.7"
}, },
"nodemonConfig": { "nodemonConfig": {
"delay": "200" "delay": "200"
}, },
Show All 15 Lines
View Options

nix/fbjni.nix

Loading...
View Options

nix/overlay.nix

Loading...
View Options

nix/tunnelbroker.nix

Loading...