Merge pull request #2376 from brave/android-apk

enable android apk build from brave-core
brave · May 8, 2019 · cfce60e · cfce60e
2 parents 0d4e31f + e3917f6
commit cfce60e
Show file tree

Hide file tree

Showing 82 changed files with 1,218 additions and 542 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -31,21 +31,31 @@ group("browser_dependencies") {
   deps = [
     "//brave/browser",
     "common",
-    ":packed_resources",
     "chromium_src:browser",
   ]
 
   data_deps = [
     ":unpacked_resources",
   ]
+
+  if (!is_android) {
+    deps += [
+      ":packed_resources",
+    ]
+  }
 }
 
 group("brave") {
-  deps = [
-    ":generate_version",
-    "build/$target_os:brave",
-    "//chrome",
-  ]
+  deps = []
+  if (is_android) {
+    deps += [ "//chrome/android:chrome_public_apk" ]
+  } else {
+    deps += [
+      ":generate_version",
+      "build/$target_os:brave",
+      "//chrome"
+    ]
+  }
 }
 
 group("resources") {
@@ -83,17 +93,22 @@ if (is_mac) {
 
 group("unpacked_resources") {
   if (!is_mac) {
-    deps = [
-      "//brave/components/brave_extension/extension/brave_extension:locales",
-    ]
-    if (brave_rewards_enabled) {
-      deps += [
-        "//brave/components/brave_rewards/resources/extension:locales",
+    deps = []
+    if (enable_extensions) {
+      deps = [
+        "//brave/components/brave_extension/extension/brave_extension:locales",
       ]
+      if (brave_rewards_enabled) {
+        deps += [
+          "//brave/components/brave_rewards/resources/extension:locales",
+        ]
+      }
     }
   }
 }
 
+#TODO(bridiver) - what to do
+if (!is_android) {
 group("brave_tests") {
   testonly = true
 
@@ -102,13 +117,16 @@ group("brave_tests") {
     "test:brave_browser_tests",
   ]
 }
+}
 
-brave_paks("packed_resources") {
-  if (is_mac) {
-    output_dir = "$root_gen_dir/repack"
-    copy_data_to_bundle = true
-  } else {
-    output_dir = root_out_dir
+if (!is_android) {
+  brave_paks("packed_resources") {
+    if (is_mac) {
+      output_dir = "$root_gen_dir/repack"
+      copy_data_to_bundle = true
+    } else {
+      output_dir = root_out_dir
+    }
   }
 }
 
@@ -164,7 +182,7 @@ group("create_dist") {
   }
 }
 
-if (!is_mac) {
+if (!is_mac && !is_android) {
   copy("brave_locale_dist_resources") {
     deps = [
       "//chrome:packed_resources",
@@ -179,50 +197,52 @@ if (!is_mac) {
     ]
   }
 
-  group("brave_extensions_locale_dist_resources") {
-    deps = [
-      "//brave/components/brave_extension/extension/brave_extension:locales",
-    ]
-    if (brave_rewards_enabled) {
-      deps += [
-        "//brave/components/brave_rewards/resources/extension:locales",
+  if (enable_extensions) {
+    group("brave_extensions_locale_dist_resources") {
+      deps = [
+        "//brave/components/brave_extension/extension/brave_extension:locales",
       ]
+      if (brave_rewards_enabled) {
+        deps += [
+          "//brave/components/brave_rewards/resources/extension:locales",
+        ]
+      }
+
+      public_deps = []
+      foreach(locale, locales) {
+        # public_deps is used intentionaly because ":create_dist_zip" needs the all dependency
+        # of all locale files.
+        public_deps += [":brave_shields_locales_${locale}"]
+        if (brave_rewards_enabled) {
+          public_deps += [":brave_rewards_locales_${locale}"]
+        }
+      }
     }
 
-    public_deps = []
     foreach(locale, locales) {
-      # public_deps is used intentionaly because ":create_dist_zip" needs the all dependency
-      # of all locale files.
-      public_deps += [":brave_shields_locales_${locale}"]
       if (brave_rewards_enabled) {
-        public_deps += [":brave_rewards_locales_${locale}"]
+        copy("brave_rewards_locales_${locale}") {
+          deps = [ "//brave/components/brave_rewards/resources/extension:locales_$locale" ]
+
+          locale = string_replace(locale, "-", "_")
+          locale = string_replace(locale, "nb", "no")
+          sources = [ "$root_out_dir/resources/brave_rewards/_locales/$locale/messages.json" ]
+          outputs = [
+            "$brave_dist_dir/resources/brave_rewards/_locales/$locale/{{source_file_part}}",
+          ]
+        }
       }
-    }
-  }
-
-  foreach(locale, locales) {
-    if (brave_rewards_enabled) {
-      copy("brave_rewards_locales_${locale}") {
-        deps = [ "//brave/components/brave_rewards/resources/extension:locales_$locale" ]
+      copy("brave_shields_locales_${locale}") {
+        deps = [ "//brave/components/brave_extension/extension/brave_extension:locales_$locale" ]
 
         locale = string_replace(locale, "-", "_")
         locale = string_replace(locale, "nb", "no")
-        sources = [ "$root_out_dir/resources/brave_rewards/_locales/$locale/messages.json" ]
+        sources = [ "$root_out_dir/resources/brave_extension/_locales/$locale/messages.json" ]
         outputs = [
-          "$brave_dist_dir/resources/brave_rewards/_locales/$locale/{{source_file_part}}",
+          "$brave_dist_dir/resources/brave_extension/_locales/$locale/{{source_file_part}}",
         ]
       }
     }
-    copy("brave_shields_locales_${locale}") {
-      deps = [ "//brave/components/brave_extension/extension/brave_extension:locales_$locale" ]
-
-      locale = string_replace(locale, "-", "_")
-      locale = string_replace(locale, "nb", "no")
-      sources = [ "$root_out_dir/resources/brave_extension/_locales/$locale/messages.json" ]
-      outputs = [
-        "$brave_dist_dir/resources/brave_extension/_locales/$locale/{{source_file_part}}",
-      ]
-    }
   }
 }
 
@@ -232,26 +252,27 @@ if (target_cpu == "x86") {
   target_arch = target_cpu
 }
 
-chromedriver = "chromedriver"
-if (is_win) {
-  chromedriver = "$chromedriver.exe"
-}
+if (!is_android) {
+  chromedriver = "chromedriver"
+  if (is_win) {
+    chromedriver = "$chromedriver.exe"
+  }
 
-chromedriver_version = "2.33"
+  chromedriver_version = "2.33"
 
-copy("brave_chromedriver_dist_resources") {
-  sources = [
-    "$root_out_dir/$chromedriver",
-  ]
+  copy("brave_chromedriver_dist_resources") {
+    sources = [
+      "$root_out_dir/$chromedriver",
+    ]
 
-  outputs = [
-    "$brave_dist_dir/$chromedriver"
-  ]
+    outputs = [
+      "$brave_dist_dir/$chromedriver"
+    ]
 
-  deps = [ "//chrome/test/chromedriver:chromedriver" ]
+    deps = [ "//chrome/test/chromedriver:chromedriver" ]
+  }
 }
 
-
 action("generate_chromium_licenses") {
   license_file = "$root_gen_dir/LICENSES.chromium.html"
 
@@ -293,61 +314,63 @@ process_version("generate_version") {
   output = "$root_out_dir/version"
 }
 
-copy("brave_dist_resources") {
-  sources = [ "$root_out_dir/version" ]
+if (!is_android) {
+  copy("brave_dist_resources") {
+    sources = [ "$root_out_dir/version" ]
 
-  deps = [
-    ":brave",
-    ":generate_version",
-    ":brave_license_dist_resources",
-    ":packed_resources",
-    "build/$target_os:brave",
-    "//chrome:packed_resources",
-    "//third_party/icu:icudata",
-  ]
-
-  if (!is_mac) {
-    sources += [
-      "$root_out_dir/brave_resources.pak",
-      "$root_out_dir/brave_100_percent.pak",
-      "$root_out_dir/brave_200_percent.pak",
-      "$root_out_dir/$brave_exe",
-      "$root_out_dir/chrome_100_percent.pak",
-      "$root_out_dir/chrome_200_percent.pak",
-      "$root_out_dir/icudtl.dat",
-      "$root_out_dir/resources.pak",
+    deps = [
+      ":brave",
+      ":generate_version",
+      ":brave_license_dist_resources",
+      ":packed_resources",
+      "build/$target_os:brave",
+      "//chrome:packed_resources",
+      "//third_party/icu:icudata",
     ]
 
-    if (v8_use_external_startup_data) {
-      sources += [ "$root_out_dir/natives_blob.bin" ]
-      deps += [ "//v8" ]
+    if (!is_mac) {
+      sources += [
+        "$root_out_dir/brave_resources.pak",
+        "$root_out_dir/brave_100_percent.pak",
+        "$root_out_dir/brave_200_percent.pak",
+        "$root_out_dir/$brave_exe",
+        "$root_out_dir/chrome_100_percent.pak",
+        "$root_out_dir/chrome_200_percent.pak",
+        "$root_out_dir/icudtl.dat",
+        "$root_out_dir/resources.pak",
+      ]
+
+      if (v8_use_external_startup_data) {
+        sources += [ "$root_out_dir/natives_blob.bin" ]
+        deps += [ "//v8" ]
 
-      if (use_v8_context_snapshot) {
-        sources += [ "$root_out_dir/v8_context_snapshot.bin" ]
-        deps += [ "//tools/v8_context_snapshot" ]
-      } else {
-        sources += [ "$root_out_dir/snapshot_blob.bin" ]
+        if (use_v8_context_snapshot) {
+          sources += [ "$root_out_dir/v8_context_snapshot.bin" ]
+          deps += [ "//tools/v8_context_snapshot" ]
+        } else {
+          sources += [ "$root_out_dir/snapshot_blob.bin" ]
+        }
       }
     }
-  }
 
-  outputs = [
-    "$brave_dist_dir/{{source_file_part}}"
-  ]
-}
+    outputs = [
+      "$brave_dist_dir/{{source_file_part}}"
+    ]
+  }
 
-zip("chromedriver_zip") {
-  inputs = get_target_outputs(":brave_chromedriver_dist_resources")
-  inputs += get_target_outputs(":brave_license_dist_resources")
-  output = "$brave_dist_dir/chromedriver-v$chromedriver_version-$brave_platform-$target_arch.zip"
+  zip("chromedriver_zip") {
+    inputs = get_target_outputs(":brave_chromedriver_dist_resources")
+    inputs += get_target_outputs(":brave_license_dist_resources")
+    output = "$brave_dist_dir/chromedriver-v$chromedriver_version-$brave_platform-$target_arch.zip"
 
-  base_dir = brave_dist_dir
+    base_dir = brave_dist_dir
 
-  deps = [
-    "app/$current_os:chromedriver_dist_resources",
-    ":brave_chromedriver_dist_resources",
-    ":brave_license_dist_resources",
-  ]
+    deps = [
+      "app/$current_os:chromedriver_dist_resources",
+      ":brave_chromedriver_dist_resources",
+      ":brave_license_dist_resources",
+    ]
+  }
 }
 
 action("create_symbols_dist") {
@@ -389,13 +412,15 @@ action("create_dist_zips") {
 
   inputs = get_target_outputs(":brave_license_dist_resources")
 
-  if (!is_mac) {
+  if (!is_mac && !is_android) {
     inputs += get_target_outputs(":brave_dist_resources")
     inputs += get_target_outputs(":brave_locale_dist_resources")
-    foreach(locale, locales) {
-      inputs += get_target_outputs(":brave_shields_locales_${locale}")
-      if (brave_rewards_enabled) {
-        inputs += get_target_outputs(":brave_rewards_locales_${locale}")
+    if (enable_extensions) {
+      foreach(locale, locales) {
+        inputs += get_target_outputs(":brave_shields_locales_${locale}")
+        if (brave_rewards_enabled) {
+          inputs += get_target_outputs(":brave_rewards_locales_${locale}")
+        }
       }
     }
   }
@@ -430,14 +455,21 @@ action("create_dist_zips") {
     "app/$current_os:dist_resources",
   ]
 
-  deps += [ ":chromedriver_zip" ]
+  if (!is_android) {
+    deps += [ ":chromedriver_zip" ]
+  }
 
-  if (!is_mac) {
+  if (!is_mac && !is_android) {
     deps += [
       ":brave_dist_resources",
       ":brave_locale_dist_resources",
-      ":brave_extensions_locale_dist_resources",
     ]
+
+    if (enable_extensions) {
+      deps += [
+        ":brave_extensions_locale_dist_resources",
+      ]
+    }
   }
 
   rebase_output = rebase_path(output)

diff --git a/DEPS b/DEPS
@@ -2,7 +2,7 @@ use_relative_paths = True
 
 deps = {
   "vendor/ad-block": "https://github.com/brave/ad-block.git@11ab48c4b2bd5355e789d4c87005ab2c14eecc09",
-  "vendor/autoplay-whitelist": "https://github.com/brave/autoplay-whitelist.git@458053a3c95b403cbe0872f289a2aafa106ee9d8",
+  "vendor/autoplay-whitelist": "https://github.com/brave/autoplay-whitelist.git@a85d71af4e416cf8188dc297320b0d777aafa315",
   "vendor/extension-whitelist": "https://github.com/brave/extension-whitelist.git@463e5e4e06e0ca84927176e8c72f6076ae9b6829",
   "vendor/tracking-protection": "https://github.com/brave/tracking-protection.git@29b1f86b11a8c7438fd7d57b446a77a84946712a",
   "vendor/hashset-cpp": "https://github.com/brave/hashset-cpp.git@4b55fe39bb25bb0d8b11a43d547d75f00c6c46fb",

diff --git a/app/android/BUILD.gn b/app/android/BUILD.gn
@@ -0,0 +1,5 @@
+import("//brave/build/config.gni")
+
+group("chromedriver_dist_resources") {}
+group("symbol_dist_resources") {}
+group("dist_resources") {}