From 736c43a1bb8fd492274a7c1c1e944b9ef9698804 Mon Sep 17 00:00:00 2001
From: Tobin Ehlis <tobine@google.com>
Date: Mon, 31 Aug 2020 10:23:27 -0600
Subject: [PATCH] Rename ANGLE apk package to org.chromium.angle

Bug: b/167223999
Change-Id: Iaa0b7c779bf744da17a0defba32c966225300a4c
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2385915
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Tim Van Patten <timvp@google.com>
Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com>
Commit-Queue: Tobin Ehlis <tobine@google.com>
---
 BUILD.gn                                | 2 +-
 android/AndroidManifest.xml.jinja2      | 2 +-
 doc/DevSetupAndroid.md                  | 8 ++++----
 src/feature_support_util/a4a_rules.json | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index c931bc90b..d1dfeeb7b 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1176,7 +1176,7 @@ if (build_with_chromium && !is_component_build && is_android &&
     current_toolchain == default_toolchain) {
   # Package ANGLE libraries
   angle_apk("angle_chromium_apk") {
-    package_name = "com.chromium.angle"
+    package_name = "org.chromium.angle"
     apk_name = "AngleLibraries"
   }
 
diff --git a/android/AndroidManifest.xml.jinja2 b/android/AndroidManifest.xml.jinja2
index 4d990f8d8..54bf2c7ff 100644
--- a/android/AndroidManifest.xml.jinja2
+++ b/android/AndroidManifest.xml.jinja2
@@ -7,7 +7,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
-          package="{{manifest_package|default('com.chromium.angle')}}">
+          package="{{manifest_package|default('org.chromium.angle')}}">
 
     <application android:label="Angle for Android"
                  android:extractNativeLibs="{{extract_native_libs|default('false')}}"
diff --git a/doc/DevSetupAndroid.md b/doc/DevSetupAndroid.md
index 2444e63cc..6139fc7c7 100644
--- a/doc/DevSetupAndroid.md
+++ b/doc/DevSetupAndroid.md
@@ -88,14 +88,14 @@ adb install out/Debug/apks/AngleLibraries.apk
 ```
 You can verify installation by looking for the package name:
 ```
-$ adb shell pm path com.chromium.angle
-package:/data/app/com.chromium.angle-HpkUceNFjoLYKPbIVxFWLQ==/base.apk
+$ adb shell pm path org.chromium.angle
+package:/data/app/org.chromium.angle-HpkUceNFjoLYKPbIVxFWLQ==/base.apk
 ```
 ## Selecting ANGLE as the OpenGL ES driver
 
 For debuggable applications or root users, you can tell the platform to load ANGLE libraries from the installed package.
 ```
-adb shell settings put global angle_debug_package com.chromium.angle
+adb shell settings put global angle_debug_package org.chromium.angle
 ```
 Remember that ANGLE can only be used by applications launched by the Java runtime.
 
@@ -134,7 +134,7 @@ Check to see that ANGLE was loaded by your application:
 ```
 $ adb logcat -d | grep ANGLE
 V GraphicsEnvironment: ANGLE developer option for <package name>: angle
-I GraphicsEnvironment: ANGLE package enabled: com.chromium.angle
+I GraphicsEnvironment: ANGLE package enabled: org.chromium.angle
 I ANGLE   : Version (2.1.0.f87fac56d22f), Renderer (Vulkan 1.1.87(Adreno (TM) 615 (0x06010501)))
 ```
 ## Clean up
diff --git a/src/feature_support_util/a4a_rules.json b/src/feature_support_util/a4a_rules.json
index f12d8e559..7bce7d5ac 100644
--- a/src/feature_support_util/a4a_rules.json
+++ b/src/feature_support_util/a4a_rules.json
@@ -9,7 +9,7 @@
          "UseANGLE":true,
          "Applications":[
             {
-               "AppName":"com.chromium.angle"
+               "AppName":"org.chromium.angle"
             }
          ],
          "Devices":[