Paths

Table of Contentst

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

	F2016059: D4433.id14126.diff
	Sat, Jun 15, 1:24 AM

	Unknown Object (File)
	Thu, Jun 13, 7:45 AM

	Unknown Object (File)
	Mon, Jun 10, 8:27 AM

	Unknown Object (File)
	Mon, Jun 10, 8:27 AM

	Unknown Object (File)
	Mon, Jun 10, 8:27 AM

	Unknown Object (File)
	Mon, Jun 10, 8:27 AM

	Unknown Object (File)
	Mon, Jun 10, 8:26 AM

	Unknown Object (File)
	Mon, Jun 10, 8:18 AM

Subscribers

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

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)

Remove androidDevEnv from dev shell

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

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!

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

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

Path

Size

1 line

native/

android/

app/

70 lines

5 lines

src/

cpp/

CommSecureStore.cpp

2 lines

GlobalNetworkSingletonJNIHelper.cpp

4 lines

2 lines

PlatformSpecificTools.cpp

4 lines

ThreadOperationsJNIHelper.cpp

6 lines

jsiInstaller.cpp

9 lines

cpp/

8 lines

CommonCpp/

3 lines

CryptoTools/

3 lines

DatabaseManagers/

1 line

NativeModules/

2 lines

Tools/

3 lines

grpc/

5 lines

nix/

android-dev-env.nix

33 lines

21 lines

17 lines

tunnelbroker.nix

54 lines

Diff 14195

flake.nix

Loading...

native/android/app/CMakeLists.txt

Loading...

native/android/app/build.gradle

Loading...

native/android/app/src/cpp/CommSecureStore.cpp

Loading...

native/android/app/src/cpp/GlobalNetworkSingletonJNIHelper.cpp

Loading...

native/android/app/src/cpp/Logger.cpp

Loading...

native/android/app/src/cpp/PlatformSpecificTools.cpp

Loading...

native/android/app/src/cpp/ThreadOperationsJNIHelper.cpp

Loading...

native/android/app/src/cpp/jsiInstaller.cpp

Loading...

native/cpp/CMakeLists.txt

Loading...

native/cpp/CommonCpp/CMakeLists.txt

Loading...

native/cpp/CommonCpp/CryptoTools/CMakeLists.txt

Loading...

native/cpp/CommonCpp/DatabaseManagers/CMakeLists.txt

Loading...

native/cpp/CommonCpp/NativeModules/CMakeLists.txt

Loading...

native/cpp/CommonCpp/Tools/CMakeLists.txt

Loading...

native/cpp/CommonCpp/grpc/CMakeLists.txt

Loading...

nix/android-dev-env.nix

Loading...

nix/dev-shell.nix

Loading...

nix/overlay.nix

Loading...

nix/tunnelbroker.nix

Loading...