Issue 6287 - Create codename Orca v.0 to launch internally to the team

chrome/android/BUILD.gn

Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index d3e4b8a592ad711c2274eaaa7b2f7e371f624c80..5c8a4eca718aaecae451fb9f7bf4a7282b9c9c7a 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -19,7 +19,8 @@ import("//tools/resources/generate_resource_whitelist.gni")
 import("channel.gni")
 import("java_sources.gni")
 
-manifest_package = "org.chromium.chrome"
+# Change package name. See https://issues.adblockplus.org/ticket/6287
+manifest_package = "org.adblockplus.orca"
 
 chrome_public_jinja_variables = default_chrome_public_jinja_variables +
                                 [ "manifest_package=$manifest_package" ]
@@ -88,7 +89,8 @@ jinja_template("chrome_sync_shell_android_manifest") {
 android_resources("chrome_java_resources") {
   resource_dirs = [
     "java/res",
-    "//chrome/android/java/res_chromium",
+    # Change res directory for rebranding. See https://issues.adblockplus.org/ticket/6287
+    "//chrome/android/java/res_orca",
   ]
   deps = [
     ":chrome_strings_grd",
@@ -648,7 +650,8 @@ if (enable_vr) {
 
 # Overrides icon / name defined in chrome_java_resources.
 android_resources("chrome_public_apk_resources") {
-  resource_dirs = [ "java/res_chromium" ]
+  # Change res directory for rebranding. See https://issues.adblockplus.org/ticket/6287
+  resource_dirs = [ "java/res_orca" ]
 
   # Dep needed to ensure override works properly.
   deps = [
@@ -972,7 +975,8 @@ template("chrome_public_apk_tmpl_shared") {
 chrome_public_apk_tmpl_shared("chrome_public_apk") {
   android_manifest = chrome_public_android_manifest
   android_manifest_dep = ":chrome_public_android_manifest"
-  apk_name = "ChromePublic"
+  # Change APK name for rebranding. See https://issues.adblockplus.org/ticket/6287
+  apk_name = "OrcaPublic"
   shared_libraries = [ ":chrome" ]
   shared_libraries += [ "//third_party/libadblockplus_android:aar_java_native" ]
 }
@@ -980,7 +984,8 @@ chrome_public_apk_tmpl_shared("chrome_public_apk") {
 chrome_public_apk_tmpl_shared("chrome_modern_public_apk") {
   android_manifest = chrome_modern_public_android_manifest
   android_manifest_dep = ":chrome_modern_public_android_manifest"
-  apk_name = "ChromeModernPublic"
+  # Change res directory for rebranding. See https://issues.adblockplus.org/ticket/6287

[diegocarloslima, 2018/02/01 10:05:58]

This comment should also be 'Change APK name'

[jens, 2018/02/01 10:12:57]

Acknowledged.

+  apk_name = "OrcaModernPublic"
   shared_libraries = [ ":chrome" ]
   shared_libraries += [ "//third_party/libadblockplus_android:aar_java_native" ]
 
@@ -1106,7 +1111,8 @@ instrumentation_test_apk("chrome_public_test_apk") {
 
 if (enable_vr) {
   instrumentation_test_apk("chrome_public_test_vr_apk") {
-    apk_name = "ChromePublicTestVr"
+    # Change res directory for rebranding. See https://issues.adblockplus.org/ticket/6287

[diegocarloslima, 2018/02/01 10:05:58]

This comment should also be 'Change APK name'

[jens, 2018/02/01 10:12:57]

Acknowledged.

+    apk_name = "OrcaPublicTestVr"
     apk_under_test = ":chrome_public_apk"
     android_manifest = chrome_public_test_vr_apk_manifest
     android_manifest_dep = ":chrome_public_test_vr_apk_manifest"