enable android apk build from brave-core #2376

bridiver · 2019-05-06T21:16:10Z

Submitter Checklist:

Test Plan:

Reviewer Checklist:

New files have MPL-2.0 license header.
Request a security/privacy review as needed.
Adequate test coverage exists to prevent regressions
Verify test plan is specified in PR before merging to source

After-merge Checklist:

The associated issue milestone is set to the smallest version that the
changes has landed on.
All relevant documentation has been updated.

petemill · 2019-05-07T20:56:22Z

@bridiver what's the command for building the android output? Is it similar to https://github.com/brave/browser-android-tabs where we:

Generate a build output that has the flag: target_os = "android"
Run directly ninja -C out/[target name] chrome_public_apk
?

bridiver · 2019-05-08T00:31:33Z

@petemill
npm run init -- --target_os=android
npm run build -- --target_os=android
for now

simonhong · 2019-05-08T02:16:52Z

patches/chrome-utility-BUILD.gn.patch

+
+   public_deps = []
+   deps = [
+    "//brave/utility",


This doesn't cause circular dependency?
//brave/utility target has //chrome/utility in its dep list.

simonhong · 2019-05-08T02:32:36Z

chromium_src/chrome/browser/ui/views/toolbar/toolbar_view.cc

@@ -3,6 +3,9 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this file,
 * You can obtain one at http://mozilla.org/MPL/2.0/. */

+#include "extensions/buildflags/buildflags.h"
+
+#if BUILDFLAG(ENABLE_EXTENSIONS)


I think ToolbarView overriding is not just for extension?

this particular set of headers could not be included without triggering an error because they include other extension headers. This is likely because chromium doesn't test non-default options so while they aren't strictly for extensions, they cannot be used without extensions being enabled

simonhong · 2019-05-08T02:45:29Z

browser/component_updater/brave_component_installer.cc

@@ -38,8 +36,9 @@ bool RewriteManifestFile(
  // Add the public key
  DCHECK(!public_key.empty());

+FILE_PATH_LITERAL()


simonhong · 2019-05-08T02:48:16Z

browser/brave_profile_prefs.cc

@@ -33,7 +33,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
      registry);

  // appearance
+#if !defined(OS_ANDROID)
  BraveThemeService::RegisterProfilePrefs(registry);


Why only this is in non-android? I think kLocationBarIsWide is not related with android?
Or this is just for avoiding compile error?

I don't believe the theme service exists on android and this fixed either compile or linking error

bbondy

Looks like all file permissions are being changed from 100644 → 100755, could you reset that back to browser/extensions/brave_component_extension.cc 644?

bbondy

There are some binary files to remove like ._BUILD.gn

bbondy · 2019-05-08T19:01:01Z

browser/brave_profile_prefs.cc

@@ -33,7 +33,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
      registry);

  // appearance
+#if !defined(OS_ANDROID)
  BraveThemeService::RegisterProfilePrefs(registry);


There is a dark theme on android from Chromium I believe behind a feature flag, but it might not be using this.
Doesn't block this PR in any case.

bbondy · 2019-05-08T19:01:22Z

browser/component_updater/brave_component_installer.cc

@@ -39,7 +37,7 @@ bool RewriteManifestFile(
  DCHECK(!public_key.empty());

  std::unique_ptr<base::DictionaryValue> final_manifest(manifest.DeepCopy());
-  final_manifest->SetString(extensions::manifest_keys::kPublicKey, public_key);
+  final_manifest->SetString("key", public_key);


Not a big deal but we should define our own constants for these.

the problem was using extensions::manifest_keys::* in android

not sure if it really makes sense to define them again with the same values just for this

I think there's probably a better solution here though that separates extensions from components

brave/brave-browser#4360

bbondy · 2019-05-08T19:12:23Z

utility/importer/brave_importer.cc

@@ -524,8 +522,9 @@ bool ParsePaymentsPreferences(BraveLedger* ledger,
      break;

    default:
-      payments->min_visit_time =
-        braveledger_ledger::_default_min_publisher_duration;
+      payments->min_visit_time = 8;


I think a better fix here would be to have a different gn file for this dep and move the constant there.

agree, just wasn't sure if it was worth it for this since it's just migration from browser-laptop. I can open a ticket if you want

@bridiver yes please, issue is fine for now. Thanks!

brave/brave-browser#4359

bbondy · 2019-05-08T19:14:07Z

browser/ui/BUILD.gn

+      "views/profiles/brave_profile_chooser_view.cc",
+      "views/profiles/brave_profile_chooser_view.h",
+      "webui/brave_welcome_ui.cc",
+      "webui/brave_welcome_ui.h",


I think we'll want to have welcome_ui available in Android, we can fix later though.

bbondy

I'm ok with landing as long as it passes CI or equivalent local builds if CI is being painful.

required for brave/brave-browser#2117

simonhong

I'm also LGTM if builds are good. Nice refactoring 👍

bridiver force-pushed the android-apk branch from d21a57f to ebdaee0 Compare May 6, 2019 22:04

bridiver requested review from petemill, simonhong and SergeyZhukovsky May 6, 2019 22:06

bridiver force-pushed the android-apk branch 5 times, most recently from 9734562 to 9a31140 Compare May 7, 2019 20:41

bridiver force-pushed the android-apk branch from 206cc18 to 0fc26d8 Compare May 8, 2019 00:30

bridiver changed the title ~~wip~~ enable android apk build from brave-core May 8, 2019

bridiver marked this pull request as ready for review May 8, 2019 00:31

bridiver force-pushed the android-apk branch from 0fc26d8 to 9c749cb Compare May 8, 2019 00:32

bridiver self-assigned this May 8, 2019

simonhong reviewed May 8, 2019

View reviewed changes

bridiver force-pushed the android-apk branch 3 times, most recently from 7bf5084 to 1a4b13d Compare May 8, 2019 17:38

bbondy reviewed May 8, 2019

View reviewed changes

bridiver force-pushed the android-apk branch from c95050f to 2b2a4e9 Compare May 8, 2019 18:57

bbondy reviewed May 8, 2019

View reviewed changes

bridiver force-pushed the android-apk branch 2 times, most recently from 892754a to 513d49d Compare May 8, 2019 19:12

bbondy reviewed May 8, 2019

View reviewed changes

bridiver force-pushed the android-apk branch from 513d49d to 643c039 Compare May 8, 2019 19:17

bridiver force-pushed the android-apk branch from 643c039 to 108ee5b Compare May 8, 2019 19:20

bbondy previously approved these changes May 8, 2019

View reviewed changes

bridiver dismissed bbondy’s stale review via 1ffdd2b May 8, 2019 19:23

bridiver force-pushed the android-apk branch 2 times, most recently from 1ffdd2b to f02800e Compare May 8, 2019 19:29

add support for building android-apk

e3917f6

required for brave/brave-browser#2117

bridiver force-pushed the android-apk branch from f02800e to e3917f6 Compare May 8, 2019 19:35

bbondy approved these changes May 8, 2019

View reviewed changes

This was referenced May 8, 2019

refactor ledger lib to expose min publisher visit time in public headers brave/brave-browser#4359

Closed

refactor brave component updater to separate extension code from components brave/brave-browser#4360

Open

simonhong approved these changes May 8, 2019

View reviewed changes

bridiver merged commit cfce60e into master May 8, 2019

mihaiplesa deleted the android-apk branch May 13, 2019 10:51

MarkBuffalo mentioned this pull request Apr 19, 2024

[Snyk] Security upgrade @solana/web3.js from 1.58.0 to 1.91.3 MarkBuffalo/brave-core#12

Open

kingjay66 mentioned this pull request Apr 19, 2024

[Snyk] Security upgrade @solana/web3.js from 1.58.0 to 1.91.3 kingjay66/brave-core#7

Open

CxsLucyfer mentioned this pull request Apr 19, 2024

[Snyk] Security upgrade @solana/web3.js from 1.58.0 to 1.91.3 Cxslucyfer3Evelucifer-org/brave-core#2

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

enable android apk build from brave-core #2376

enable android apk build from brave-core #2376

bridiver commented May 6, 2019 •

edited

Loading

petemill commented May 7, 2019

bridiver commented May 8, 2019 •

edited

Loading

simonhong May 8, 2019

bridiver May 8, 2019

simonhong May 8, 2019

bridiver May 8, 2019

simonhong May 8, 2019

simonhong May 8, 2019

bridiver May 8, 2019

bbondy left a comment

bbondy left a comment

bbondy May 8, 2019

bbondy May 8, 2019

bridiver May 8, 2019

bridiver May 8, 2019

bridiver May 8, 2019

bridiver May 8, 2019

bbondy May 8, 2019

bridiver May 8, 2019

bbondy May 8, 2019

bridiver May 8, 2019

bbondy May 8, 2019

bbondy left a comment

simonhong left a comment

enable android apk build from brave-core #2376

enable android apk build from brave-core #2376

Conversation

bridiver commented May 6, 2019 • edited Loading

Submitter Checklist:

Test Plan:

Reviewer Checklist:

After-merge Checklist:

petemill commented May 7, 2019

bridiver commented May 8, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bbondy left a comment

Choose a reason for hiding this comment

bbondy left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bbondy left a comment

Choose a reason for hiding this comment

simonhong left a comment

Choose a reason for hiding this comment

bridiver commented May 6, 2019 •

edited

Loading

bridiver commented May 8, 2019 •

edited

Loading