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

chrome/android/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//base/android/jni_generator/jni_exception_list.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/util/process_version.gni")
 import("//chrome/android/chrome_public_apk_tmpl.gni")
 import("//chrome/android/monochrome_android_manifest_jinja_variables.gni")
 import("//chrome/chrome_paks.gni")
 import("//chrome/common/features.gni")
 import("//chrome/process_version_rc_template.gni")  # For branding_file_path.
 import("//device/vr/features/features.gni")
 import("//testing/test.gni")
 import("//third_party/icu/config.gni")
 import("//third_party/protobuf/proto_library.gni")
 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" ]
 chrome_public_android_manifest =
     "$target_gen_dir/chrome_public_apk/AndroidManifest.xml"
 chrome_modern_public_android_manifest =
     "$target_gen_dir/chrome_modern_public_apk/AndroidManifest.xml"
 chrome_sync_shell_android_manifest =
     "$target_gen_dir/chrome_sync_shell_apk/AndroidManifest.xml"
 monochrome_public_android_manifest =
@@ skipping 48 matching lines @@
   variables = chrome_sync_shell_jinja_variables
   variables += [
     "min_sdk_version=16",
     "target_sdk_version=22",
   ]
 }
 
 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",
     "//chrome/app:java_strings_grd",
     "//components/autofill/android:autofill_java_resources",
     "//components/policy:app_restrictions_resources",
     "//components/strings:components_locale_settings_grd",
     "//components/strings:components_strings_grd",
     "//content/public/android:content_java_resources",
     "//third_party/android_data_chart:android_data_chart_java_resources",
@@ skipping 539 matching lines @@
       "//chrome/android/shared_preference_files/test/",
       "//chrome/test/data/android/",
       "//third_party/gvr-android-sdk/test-apks/",
       "//third_party/WebKit/LayoutTests/resources/testharness.js",
     ]
   }
 }
 
 # 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 = [
     ":chrome_java_resources",
   ]
 }
 
 java_group("chrome_public_non_pak_assets") {
   deps = [
     "//chrome/android/webapk/libs/runtime_library:runtime_library_assets",
@@ skipping 303 matching lines @@
       ":chrome_public_non_pak_assets",
       ":chrome_public_pak_assets",
       "//base:base_java",
     ]
   }
 }
 
 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" ]
 }
 
 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" ]
 
   if (!is_java_debug) {
     png_to_webp = true
   }
 
   # Always enable load_library_from_apk.
   load_library_from_apk = chromium_linker_supported
 }
@@ skipping 105 matching lines @@
   }
 
   # The test APK contains code from both the APK under test and the
   # test APK when proguard is enabled. That causes this APK to exceed
   # the dex limit.
   enable_multidex = proguard_enabled
 }
 
 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"
 
     deps = [
       ":chrome_test_vr_java",
     ]
     additional_apks = [ "//net/android:net_test_support_apk" ]
     proguard_enabled = !is_java_debug
     if (proguard_enabled && !enable_proguard_obfuscation &&
@@ skipping 57 matching lines @@
     "//ui/android:ui_java",
   ]
   proguard_enabled = !is_java_debug
   if (proguard_enabled && !enable_proguard_obfuscation &&
       enable_proguard_obfuscation_for_tests) {
     proguard_configs = [ "//base/android/proguard/enable_obfuscation.flags" ]
     proguard_config_exclusions =
         [ "//base/android/proguard/disable_chromium_obfuscation.flags" ]
   }
 }