Page MenuHomePhabricator
Differential D5604

[native] Avoid hardcoding path to rust_native_library lib.rs.h file
ClosedPublic
Actions

Authored by ashoat on Nov 10 2022, 12:41 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 15, 9:31 PM
Unknown Object (File)
Tue, Mar 4, 11:45 PM
Unknown Object (File)
Tue, Mar 4, 11:45 PM
Unknown Object (File)
Tue, Mar 4, 11:45 PM
Unknown Object (File)
Tue, Mar 4, 11:45 PM
Unknown Object (File)
Tue, Mar 4, 11:40 PM
Unknown Object (File)
Feb 25 2025, 1:21 AM
Unknown Object (File)
Feb 16 2025, 9:44 PM
View All Files
Subscribers
• abosh
atul
tomek

Details

Reviewers
varun
• jon
• max
Commits
rCOMMf7a17e3c25fa: [native] Avoid hardcoding path to rust_native_library lib.rs.h file
Summary

In D5480 we hardcoded a path to this that ended up changing in a later version of React Native. This diff updates the code so the path is passed directly from corrosion-cxx.cmake to where it's consumed.

Test Plan

I tested an Android debug build on both current master and my React Native upgrade branch and it worked

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
native/
android/
app/
2 lines
shared/
cmake/
15 lines

Diff 18351

View Options

native/android/app/CMakeLists.txt

#pragma once #pragma once
#include "AwsTools.h" #include "AwsTools.h"
#include "Constants.h" #include "Constants.h"
#include "DatabaseEntitiesTools.h" #include "DatabaseEntitiesTools.h"
#include "Tools.h" #include "Tools.h"
#include <aws/core/Aws.h> #include <aws/core/Aws.h>
#include <aws/core/utils/Outcome.h> #include <aws/core/utils/Outcome.h>
#include <aws/dynamodb/model/AttributeDefinition.h> #include <aws/dynamodb/model/AttributeDefinition.h>
#include <aws/dynamodb/model/DeleteItemRequest.h> #include <aws/dynamodb/model/DeleteItemRequest.h>
#include <aws/dynamodb/model/DescribeTableRequest.h> #include <aws/dynamodb/model/DescribeTableRequest.h>
#include <aws/dynamodb/model/DescribeTableResult.h> #include <aws/dynamodb/model/DescribeTableResult.h>
#include <aws/dynamodb/model/GetItemRequest.h> #include <aws/dynamodb/model/GetItemRequest.h>
#include <aws/dynamodb/model/PutItemRequest.h> #include <aws/dynamodb/model/PutItemRequest.h>
#include <aws/dynamodb/model/QueryRequest.h>
#include <memory> #include <memory>
#include <string> #include <string>
namespace comm { namespace comm {
namespace network { namespace network {
namespace database { namespace database {
Show All 22 Linespublic:
void removeSessionSignItem(const std::string &deviceID); void removeSessionSignItem(const std::string &deviceID);
void putPublicKeyItem(const PublicKeyItem &item); void putPublicKeyItem(const PublicKeyItem &item);
std::shared_ptr<PublicKeyItem> findPublicKeyItem(const std::string &deviceID); std::shared_ptr<PublicKeyItem> findPublicKeyItem(const std::string &deviceID);
void removePublicKeyItem(const std::string &deviceID); void removePublicKeyItem(const std::string &deviceID);
void putMessageItem(const MessageItem &item); void putMessageItem(const MessageItem &item);
std::shared_ptr<MessageItem> findMessageItem(const std::string &messageID); std::shared_ptr<MessageItem> findMessageItem(const std::string &messageID);
std::vector<std::shared_ptr<MessageItem>>
findMessageItemsByReceiver(const std::string &toDeviceID);
void removeMessageItem(const std::string &messageID); void removeMessageItem(const std::string &messageID);
}; };
} // namespace database } // namespace database
} // namespace network } // namespace network
} // namespace comm } // namespace comm
View Options

shared/cmake/corrosion-cxx.cmake

#pragma once #pragma once
#include "AwsTools.h" #include "AwsTools.h"
#include "Constants.h" #include "Constants.h"
#include "DatabaseEntitiesTools.h" #include "DatabaseEntitiesTools.h"
#include "Tools.h" #include "Tools.h"
#include <aws/core/Aws.h> #include <aws/core/Aws.h>
#include <aws/core/utils/Outcome.h> #include <aws/core/utils/Outcome.h>
#include <aws/dynamodb/model/AttributeDefinition.h> #include <aws/dynamodb/model/AttributeDefinition.h>
#include <aws/dynamodb/model/DeleteItemRequest.h> #include <aws/dynamodb/model/DeleteItemRequest.h>
#include <aws/dynamodb/model/DescribeTableRequest.h> #include <aws/dynamodb/model/DescribeTableRequest.h>
#include <aws/dynamodb/model/DescribeTableResult.h> #include <aws/dynamodb/model/DescribeTableResult.h>
#include <aws/dynamodb/model/GetItemRequest.h> #include <aws/dynamodb/model/GetItemRequest.h>
#include <aws/dynamodb/model/PutItemRequest.h> #include <aws/dynamodb/model/PutItemRequest.h>
#include <aws/dynamodb/model/QueryRequest.h>
#include <memory> #include <memory>
#include <string> #include <string>
namespace comm { namespace comm {
namespace network { namespace network {
namespace database { namespace database {
Show All 22 Linespublic:
void removeSessionSignItem(const std::string &deviceID); void removeSessionSignItem(const std::string &deviceID);
void putPublicKeyItem(const PublicKeyItem &item); void putPublicKeyItem(const PublicKeyItem &item);
std::shared_ptr<PublicKeyItem> findPublicKeyItem(const std::string &deviceID); std::shared_ptr<PublicKeyItem> findPublicKeyItem(const std::string &deviceID);
void removePublicKeyItem(const std::string &deviceID); void removePublicKeyItem(const std::string &deviceID);
void putMessageItem(const MessageItem &item); void putMessageItem(const MessageItem &item);
std::shared_ptr<MessageItem> findMessageItem(const std::string &messageID); std::shared_ptr<MessageItem> findMessageItem(const std::string &messageID);
std::vector<std::shared_ptr<MessageItem>>
findMessageItemsByReceiver(const std::string &toDeviceID);
void removeMessageItem(const std::string &messageID); void removeMessageItem(const std::string &messageID);
}; };
} // namespace database } // namespace database
} // namespace network } // namespace network
} // namespace comm } // namespace comm