Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

extention [WIP] #114

Open
wants to merge 2 commits into
base: chromium
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,6 @@ group("gn_all") {
if (enable_extensions) {
deps += [
"//extensions:extensions_browsertests",
"//extensions:extensions_unittests",
"//extensions/browser/api/declarative_net_request/filter_list_converter",
"//extensions/shell:app_shell_unittests",
]
Expand Down
9 changes: 9 additions & 0 deletions src/\
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
target_os = "android"
target_cpu = "arm64"
is_official_build = true
is_debug = false
symbol_level = 0
enable_nacl = false
proprietary_codecs = true
ffmpeg_branding = "Chrome"
remove_webcore_debug_symbols = true
1 change: 0 additions & 1 deletion src/apps/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import("//build/config/features.gni")
import("//build/config/ui.gni")
import("//extensions/buildflags/buildflags.gni")

assert(!is_android && !is_ios)
assert(enable_extensions,
"Cannot depend on extensions because enable_extensions=false.")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,7 @@ public static boolean isContentUri(String uri) {
public static boolean delete(String uriString) {
assert isContentUri(uriString);
Uri parsedUri = Uri.parse(uriString);
Log.d(TAG, "parsedUri: %s", parsedUri.toString());
ContentResolver resolver = ContextUtils.getApplicationContext().getContentResolver();
return resolver.delete(parsedUri, null, null) > 0;
}
Expand Down
6 changes: 5 additions & 1 deletion src/base/files/file_util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include "base/containers/span.h"
#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/functional/function_ref.h"
#include "base/notreached.h"
#include "base/posix/eintr_wrapper.h"
Expand Down Expand Up @@ -331,6 +332,7 @@ bool ReadStreamToStringWithMaxSize(FILE* stream,

std::optional<std::vector<uint8_t>> ReadFileToBytes(const FilePath& path) {
if (path.ReferencesParent()) {
LOG(INFO) << "base/files/file_util.cc: ReferencesParent";
return std::nullopt;
}

Expand Down Expand Up @@ -364,8 +366,10 @@ bool ReadFileToStringWithMaxSize(const FilePath& path,
if (path.ReferencesParent())
return false;
ScopedFILE file_stream(OpenFile(path, "rb"));
if (!file_stream)
if (!file_stream) {
LOG(INFO) << "base/files/file_util.cc: !file_stream";
return false;
}
return ReadStreamToStringWithMaxSize(file_stream.get(), max_size, contents);
}

Expand Down
4 changes: 3 additions & 1 deletion src/base/files/file_util_posix.cc
Original file line number Diff line number Diff line change
Expand Up @@ -376,11 +376,13 @@ bool PreReadFileSlow(const FilePath& file_path, int64_t max_bytes) {
FilePath MakeAbsoluteFilePath(const FilePath& input) {
ScopedBlockingCall scoped_blocking_call(FROM_HERE, BlockingType::MAY_BLOCK);
char full_path[PATH_MAX];
if (realpath(input.value().c_str(), full_path) == nullptr)
if (realpath(input.value().c_str(), full_path) == nullptr) {
return FilePath();
}
return FilePath(full_path);
}


std::optional<FilePath> MakeAbsoluteFilePathNoResolveSymbolicLinks(
const FilePath& input) {
if (input.empty()) {
Expand Down
2 changes: 1 addition & 1 deletion src/build/config/android/rules.gni
Original file line number Diff line number Diff line change
Expand Up @@ -2706,7 +2706,7 @@ if (!is_robolectric && enable_java_templates) {
final_dex_path = _final_dex_path
}
if (defined(invoker.assert_no_native_deps)) {
assert_no_deps = invoker.assert_no_native_deps
assert_no_deps = invoker.assert_no_native_deps
}

if (_is_bundle_module) {
Expand Down
8 changes: 0 additions & 8 deletions src/chrome/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3810,14 +3810,6 @@ generate_jni("chrome_jni_headers") {
"java/src/org/chromium/chrome/browser/tabmodel/TabModelJniBridge.java",
"java/src/org/chromium/chrome/browser/tabmodel/TabModelObserverJniBridge.java",
"java/src/org/chromium/chrome/browser/usage_stats/UsageStatsBridge.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/AssetRatioServiceFactory.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/BlockchainRegistryFactory.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/WootzWalletProviderDelegateImplHelper.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/WootzWalletServiceFactory.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/SwapServiceFactory.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/dapps/ConnectAccountFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/permission/WootzDappPermissionPromptDialog.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/util/WalletNativeUtils.java",
"java/src/org/chromium/chrome/browser/webapps/WebApkDataProvider.java",
"java/src/org/chromium/chrome/browser/webapps/WebApkHandlerDelegate.java",
"java/src/org/chromium/chrome/browser/webapps/WebApkInstallService.java",
Expand Down
3 changes: 2 additions & 1 deletion src/chrome/android/chrome_java_resources.gni
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,6 @@ chrome_java_resources = [
"java/res/drawable/ic_incognito_cct_24dp.xml",
"java/res/drawable/ic_incognito_reauth_promo_icon.xml",
"java/res/drawable/ic_install_webapp.xml",
"java/res/drawable/ic_aurora_color.xml",
"java/res/drawable/ic_minimize.xml",
"java/res/drawable/ic_minimize.xml",
"java/res/drawable/ic_matic_color.xml",
Expand Down Expand Up @@ -508,6 +507,8 @@ chrome_java_resources = [
"java/res/layout/divider_line_menu_item.xml",
"java/res/layout/drag_drop_target_view.xml",
"java/res/layout/empty_accessory_sheet.xml",
"java/res/layout/extension_install_dialog.xml",
"java/res/layout/extension_uninstall_dialog.xml",
"java/res/layout/fake_search_box_layout.xml",
"java/res/layout/find_in_page.xml",
"java/res/layout/find_toolbar.xml",
Expand Down
105 changes: 4 additions & 101 deletions src/chrome/android/chrome_java_sources.gni
Original file line number Diff line number Diff line change
Expand Up @@ -1225,105 +1225,8 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorActivity.java",
"java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUSBActivity.java",
"java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/AssetRatioServiceFactory.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/BlockchainRegistryFactory.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/WootzWalletProviderDelegateImplHelper.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/WootzWalletServiceFactory.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/SwapServiceFactory.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/activities/AccountSelectorActivity.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/activities/AddAccountActivity.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/activities/AdvanceTxSettingActivity.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/activities/WootzWalletActivity.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/activities/WootzWalletBaseActivity.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/activities/WootzWalletDAppsActivity.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/activities/NetworkSelectorActivity.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/adapters/AccountSelectorRecyclerView.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/adapters/ApproveTxFragmentPageAdapter.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/adapters/AutoGridLayoutManager.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/adapters/CreateAccountAdapter.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/adapters/FragmentNavigationItemAdapter.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/adapters/NetworkSelectorAdapter.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/adapters/NetworkSpinnerAdapter.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/adapters/OnboardingNetworkSelectorGridAdapter.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/adapters/RecoveryPhraseAdapter.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/adapters/SignMessagePagerAdapter.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/adapters/TwoLineItemRecyclerViewAdapter.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/adapters/WalletOnboardingPagerAdapter.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/controller/DAppsWalletController.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/ApproveTxBottomSheetDialogFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/BaseWalletNextPageFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/CreateAccountBottomSheetFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/SolanaTxDetailsFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/TransactionDetailsSheetFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/TwoLineItemBottomSheetFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/TwoLineItemFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/TxDetailsFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/TxFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/UnlockWalletFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/WalletBottomSheetDialogFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/dapps/AddSwitchChainNetworkFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/dapps/AddTokenFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/dapps/BaseDAppsBottomSheetDialogFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/dapps/BaseDAppsFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/dapps/ConnectAccountFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/dapps/DAppsMessageFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/dapps/EncryptionKeyFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/dapps/SignMessageErrorFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/dapps/SignMessageFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/dapps/SignTransactionFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/dapps/SiweMessageFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/onboarding/BaseOnboardingWalletFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/onboarding/OnboardingBackupWalletFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/onboarding/OnboardingConfirmationFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/onboarding/OnboardingCreatingWalletFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/onboarding/OnboardingFingerprintUnlockFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/onboarding/OnboardingInitWalletFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/onboarding/OnboardingNetworkSelectionFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/onboarding/OnboardingRecoveryPhraseFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/onboarding/OnboardingRestoreWalletFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/onboarding/OnboardingSecurePasswordFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/onboarding/OnboardingTermsOfUseFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/fragments/onboarding/OnboardingVerifyRecoveryPhraseFragment.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/listeners/AccountSelectorItemListener.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/listeners/OnNextPage.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/listeners/TransactionConfirmationListener.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/modal/WootzWalletPanel.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/modal/DAppsDialog.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/model/AccountSelectorItemModel.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/model/CryptoAccountTypeInfo.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/model/OnboardingViewModel.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/model/TxNonSwipeableViewPager.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/model/WalletAccountCreationRequest.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/observers/ApprovedTxObserver.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/observers/WootzWalletServiceObserverImpl.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/observers/KeyringServiceObserverImpl.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/observers/TxServiceObserverImpl.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/permission/WootzDappPermissionPromptDialog.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/permission/WootzPermissionAccountsListAdapter.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/presenters/Amount.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/presenters/SolanaInstructionPresenter.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/util/AccountsPermissionsHelper.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/util/AndroidUtils.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/util/AssetUtils.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/util/AssetsPricesHelper.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/util/AsyncUtils.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/util/BalanceHelper.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/util/Blockies.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/util/ItemOffsetDecoration.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/util/JavaUtils.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/util/KeystoreHelper.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/util/NavigationItem.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/util/NetworkUtils.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/util/ParsedTransaction.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/util/ParsedTransactionFees.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/util/PendingTxHelper.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/util/SolanaTransactionsGasHelper.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/util/TokenUtils.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/util/TransactionUtils.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/util/Utils.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/util/Validations.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/util/WalletConstants.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/util/WalletDataFilesInstallerUtil.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/util/WalletNativeUtils.java",
"java/src/org/chromium/chrome/browser/wootz_wallet/util/WalletUtils.java",
"java/src/org/chromium/chrome/browser/extensions/ExtensionInstallDialogViewBridge.java",
"java/src/org/chromium/chrome/browser/extensions/ExtensionInstallCustomScrollView.java",
"java/src/org/chromium/chrome/browser/extensions/ExtensionUninstallDialogBridge.java",
"java/src/org/chromium/chrome/browser/extensions/ExtensionUninstallCustomScrollView.java",
]
Loading
Loading