Page MenuHomePhabricator
Differential D6498

[Native] Remove CMake installation logic from native/cpp
ClosedPublic
Actions

Authored by • jon on Feb 1 2023, 12:17 PM.
Tags
None
Referenced Files
F4948193: D6498.diff
Wed, Mar 19, 7:44 PM
Unknown Object (File)
Tue, Mar 18, 3:21 AM
Unknown Object (File)
Sun, Mar 16, 4:45 AM
Unknown Object (File)
Fri, Mar 14, 3:53 AM
Unknown Object (File)
Thu, Mar 13, 3:28 PM
Unknown Object (File)
Thu, Mar 13, 3:28 PM
Unknown Object (File)
Thu, Mar 13, 3:28 PM
Unknown Object (File)
Thu, Mar 13, 3:25 PM
View All Files
Subscribers
tomek

Details

Reviewers
• max
ashoat
varun
atul
Commits
rCOMM942f509f745c: [Native] Remove CMake installation logic from native/cpp
Summary

Not strictly needed since we don't install the
native cpp modules separately.

add_subdirectory was added to android/app/CMakeLists.txt
to ensure that the CMake logic is compatible.

Depends on D6484

Test Plan

Android gate passes

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

• jon created this revision.Feb 1 2023, 12:17 PM
Herald added a subscriber: tomek. · View Herald TranscriptFeb 1 2023, 12:17 PM
Harbormaster completed remote builds in B15948: Diff 21780.Feb 1 2023, 12:34 PM
• jon requested review of this revision.Feb 1 2023, 12:34 PM
ashoat accepted this revision.Feb 1 2023, 1:06 PM
ashoat added inline comments.
native/android/app/CMakeLists.txt
107–113 ↗(On Diff #21780)

Will the add_subdirectory conflict at all with these lines?

This revision is now accepted and ready to land.Feb 1 2023, 1:06 PM
• jon marked an inline comment as done.Feb 1 2023, 2:01 PM
• jon added inline comments.
native/android/app/CMakeLists.txt
107–113 ↗(On Diff #21780)

No, it just reads the cmake files, but shouldn't affect the libcomm-jni that we produce.

• jon added a child revision: D6507: [Android] Use native modules from CMake.Feb 1 2023, 2:02 PM
• jon added a child revision: D6621: [CMake] Resolve rust library include directory.Feb 5 2023, 6:26 PM
• jon removed a child revision: D6507: [Android] Use native modules from CMake.Feb 5 2023, 6:26 PM
Closed by commit rCOMM942f509f745c: [Native] Remove CMake installation logic from native/cpp (authored by • jon). · Explain WhyFeb 6 2023, 7:22 AM
This revision was automatically updated to reflect the committed changes.
• jon marked an inline comment as done.
• jon added a commit: rCOMM942f509f745c: [Native] Remove CMake installation logic from native/cpp.

Revision Contents
Changeset List

PathSize
native/
android/
app/
5 lines
cpp/
CommonCpp/
CryptoTools/
23 lines
DatabaseManagers/
22 lines
NativeModules/
30 lines
Tools/
22 lines

Diff 22129

View Options

native/android/app/CMakeLists.txt

  • This file was added.
// @flow
import { useNavigation, useRoute } from '@react-navigation/native';
import invariant from 'invariant';
import * as React from 'react';
import { View, TouchableOpacity } from 'react-native';
import { userProfileUserInfoContainerHeight } from './user-profile-constants.js';
import UserAvatar from '../avatars/user-avatar.react.js';
import { OverlayContext } from '../navigation/overlay-context.js';
import { UserProfileAvatarModalRouteName } from '../navigation/route-names.js';
// We need to set onAvatarLayout in order to allow .measure() to be on the ref
const onAvatarLayout = () => {};
type Props = {
userID: ?string,
};
function UserProfileAvatar(props: Props): React.Node {
const { userID } = props;
const { navigate } = useNavigation();
const route = useRoute();
const overlayContext = React.useContext(OverlayContext);
const avatarRef = React.useRef();
const onPressAvatar = React.useCallback(() => {
invariant(overlayContext, 'UserProfileAvatar should have OverlayContext');
overlayContext.setScrollBlockingModalStatus('open');
const currentAvatarRef = avatarRef.current;
if (!currentAvatarRef) {
return;
}
currentAvatarRef.measure((x, y, width, height, pageX, pageY) => {
const coordinates = {
x: pageX,
y: pageY,
width,
height,
};
const verticalBounds = {
height: userProfileUserInfoContainerHeight,
y: pageY,
};
navigate<'UserProfileAvatarModal'>({
name: UserProfileAvatarModalRouteName,
params: {
presentedFrom: route.key,
initialCoordinates: coordinates,
verticalBounds,
userID,
},
});
});
}, [navigate, overlayContext, route.key, userID]);
return (
<TouchableOpacity onPress={onPressAvatar}>
<View ref={avatarRef} onLayout={onAvatarLayout}>
<UserAvatar size="L" userID={userID} />
</View>
</TouchableOpacity>
);
}
export default UserProfileAvatar;
View Options

native/cpp/CommonCpp/CryptoTools/CMakeLists.txt

  • This file was added.
// @flow
import { useNavigation, useRoute } from '@react-navigation/native';
import invariant from 'invariant';
import * as React from 'react';
import { View, TouchableOpacity } from 'react-native';
import { userProfileUserInfoContainerHeight } from './user-profile-constants.js';
import UserAvatar from '../avatars/user-avatar.react.js';
import { OverlayContext } from '../navigation/overlay-context.js';
import { UserProfileAvatarModalRouteName } from '../navigation/route-names.js';
// We need to set onAvatarLayout in order to allow .measure() to be on the ref
const onAvatarLayout = () => {};
type Props = {
userID: ?string,
};
function UserProfileAvatar(props: Props): React.Node {
const { userID } = props;
const { navigate } = useNavigation();
const route = useRoute();
const overlayContext = React.useContext(OverlayContext);
const avatarRef = React.useRef();
const onPressAvatar = React.useCallback(() => {
invariant(overlayContext, 'UserProfileAvatar should have OverlayContext');
overlayContext.setScrollBlockingModalStatus('open');
const currentAvatarRef = avatarRef.current;
if (!currentAvatarRef) {
return;
}
currentAvatarRef.measure((x, y, width, height, pageX, pageY) => {
const coordinates = {
x: pageX,
y: pageY,
width,
height,
};
const verticalBounds = {
height: userProfileUserInfoContainerHeight,
y: pageY,
};
navigate<'UserProfileAvatarModal'>({
name: UserProfileAvatarModalRouteName,
params: {
presentedFrom: route.key,
initialCoordinates: coordinates,
verticalBounds,
userID,
},
});
});
}, [navigate, overlayContext, route.key, userID]);
return (
<TouchableOpacity onPress={onPressAvatar}>
<View ref={avatarRef} onLayout={onAvatarLayout}>
<UserAvatar size="L" userID={userID} />
</View>
</TouchableOpacity>
);
}
export default UserProfileAvatar;
View Options

native/cpp/CommonCpp/DatabaseManagers/CMakeLists.txt

  • This file was added.
// @flow
import { useNavigation, useRoute } from '@react-navigation/native';
import invariant from 'invariant';
import * as React from 'react';
import { View, TouchableOpacity } from 'react-native';
import { userProfileUserInfoContainerHeight } from './user-profile-constants.js';
import UserAvatar from '../avatars/user-avatar.react.js';
import { OverlayContext } from '../navigation/overlay-context.js';
import { UserProfileAvatarModalRouteName } from '../navigation/route-names.js';
// We need to set onAvatarLayout in order to allow .measure() to be on the ref
const onAvatarLayout = () => {};
type Props = {
userID: ?string,
};
function UserProfileAvatar(props: Props): React.Node {
const { userID } = props;
const { navigate } = useNavigation();
const route = useRoute();
const overlayContext = React.useContext(OverlayContext);
const avatarRef = React.useRef();
const onPressAvatar = React.useCallback(() => {
invariant(overlayContext, 'UserProfileAvatar should have OverlayContext');
overlayContext.setScrollBlockingModalStatus('open');
const currentAvatarRef = avatarRef.current;
if (!currentAvatarRef) {
return;
}
currentAvatarRef.measure((x, y, width, height, pageX, pageY) => {
const coordinates = {
x: pageX,
y: pageY,
width,
height,
};
const verticalBounds = {
height: userProfileUserInfoContainerHeight,
y: pageY,
};
navigate<'UserProfileAvatarModal'>({
name: UserProfileAvatarModalRouteName,
params: {
presentedFrom: route.key,
initialCoordinates: coordinates,
verticalBounds,
userID,
},
});
});
}, [navigate, overlayContext, route.key, userID]);
return (
<TouchableOpacity onPress={onPressAvatar}>
<View ref={avatarRef} onLayout={onAvatarLayout}>
<UserAvatar size="L" userID={userID} />
</View>
</TouchableOpacity>
);
}
export default UserProfileAvatar;
View Options

native/cpp/CommonCpp/NativeModules/CMakeLists.txt

  • This file was added.
// @flow
import { useNavigation, useRoute } from '@react-navigation/native';
import invariant from 'invariant';
import * as React from 'react';
import { View, TouchableOpacity } from 'react-native';
import { userProfileUserInfoContainerHeight } from './user-profile-constants.js';
import UserAvatar from '../avatars/user-avatar.react.js';
import { OverlayContext } from '../navigation/overlay-context.js';
import { UserProfileAvatarModalRouteName } from '../navigation/route-names.js';
// We need to set onAvatarLayout in order to allow .measure() to be on the ref
const onAvatarLayout = () => {};
type Props = {
userID: ?string,
};
function UserProfileAvatar(props: Props): React.Node {
const { userID } = props;
const { navigate } = useNavigation();
const route = useRoute();
const overlayContext = React.useContext(OverlayContext);
const avatarRef = React.useRef();
const onPressAvatar = React.useCallback(() => {
invariant(overlayContext, 'UserProfileAvatar should have OverlayContext');
overlayContext.setScrollBlockingModalStatus('open');
const currentAvatarRef = avatarRef.current;
if (!currentAvatarRef) {
return;
}
currentAvatarRef.measure((x, y, width, height, pageX, pageY) => {
const coordinates = {
x: pageX,
y: pageY,
width,
height,
};
const verticalBounds = {
height: userProfileUserInfoContainerHeight,
y: pageY,
};
navigate<'UserProfileAvatarModal'>({
name: UserProfileAvatarModalRouteName,
params: {
presentedFrom: route.key,
initialCoordinates: coordinates,
verticalBounds,
userID,
},
});
});
}, [navigate, overlayContext, route.key, userID]);
return (
<TouchableOpacity onPress={onPressAvatar}>
<View ref={avatarRef} onLayout={onAvatarLayout}>
<UserAvatar size="L" userID={userID} />
</View>
</TouchableOpacity>
);
}
export default UserProfileAvatar;
View Options

native/cpp/CommonCpp/Tools/CMakeLists.txt

Loading...