Removing dead modules cablev2_authenticator and ar
These 2 modules are no longer shipped, so deleting some folders I
noticed we still had kicking around.
Also removed a Manifest from an old tab_ui DFM.
Bug: 348204152
Change-Id: I21fdd0bcac00ff2461d18a156d27b6dd345d5779
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5976416
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Adem Derinel <derinel@google.com>
Commit-Queue: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1375853}
diff --git a/chrome/android/features/ar/AndroidManifest.xml b/chrome/android/features/ar/AndroidManifest.xml
deleted file mode 100644
index edd52ff5..0000000
--- a/chrome/android/features/ar/AndroidManifest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2018 The Chromium Authors
-Use of this source code is governed by a BSD-style license that can be
-found in the LICENSE file.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:dist="http://schemas.android.com/apk/distribution"
- featureSplit="ar">
-
- <dist:module
- dist:onDemand="true"
- dist:title="@string/ar_module_title">
- <dist:fusing dist:include="true" />
- </dist:module>
-</manifest>
diff --git a/chrome/android/features/ar/DIR_METADATA b/chrome/android/features/ar/DIR_METADATA
deleted file mode 100644
index 1421b37..0000000
--- a/chrome/android/features/ar/DIR_METADATA
+++ /dev/null
@@ -1,7 +0,0 @@
-monorail: {
- component: "Internals>XR>AR"
-}
-team_email: "xr-dev@chromium.org"
-buganizer_public: {
- component_id: 1456136
-}
diff --git a/chrome/android/features/ar/OWNERS b/chrome/android/features/ar/OWNERS
deleted file mode 100644
index 600ebb1..0000000
--- a/chrome/android/features/ar/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-file://chrome/android/features/vr/OWNERS
diff --git a/chrome/android/features/ar/README b/chrome/android/features/ar/README
deleted file mode 100644
index e621db2..0000000
--- a/chrome/android/features/ar/README
+++ /dev/null
@@ -1,3 +0,0 @@
-The AR dynamic feature module on-demand delivers code necessary to support AR in
-Chrome. This folder contains the template for creating an AR DFM target as well
-as the required Android manifest.
\ No newline at end of file
diff --git a/chrome/android/features/ar/ar_module.gni b/chrome/android/features/ar/ar_module.gni
deleted file mode 100644
index 0e90c7c8..0000000
--- a/chrome/android/features/ar/ar_module.gni
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2019 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//device/vr/buildflags/buildflags.gni")
-
-assert(enable_arcore)
-
-_libarcore_dir = get_label_info(
- "//third_party/arcore-android-sdk-client:com_google_ar_core_java($default_toolchain)",
- "target_out_dir") + "/com_google_ar_core_java/jni"
-
-ar_module_desc = {
- name = "ar"
- java_deps = [ "//components/webxr/android:xr_java" ]
- android_manifest = "//chrome/android/features/ar/AndroidManifest.xml"
- loadable_modules_32_bit = [ "$_libarcore_dir/armeabi-v7a/libarcore_sdk_c.so" ]
- loadable_modules_64_bit = [ "$_libarcore_dir/arm64-v8a/libarcore_sdk_c.so" ]
-}
diff --git a/chrome/android/features/tab_ui/AndroidManifest.xml b/chrome/android/features/tab_ui/AndroidManifest.xml
deleted file mode 100644
index 15660508..0000000
--- a/chrome/android/features/tab_ui/AndroidManifest.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2019 The Chromium Authors
-Use of this source code is governed by a BSD-style license that can be
-found in the LICENSE file.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:dist="http://schemas.android.com/apk/distribution"
- featureSplit="tab_ui">
-
- <application></application>
- <dist:module
- dist:onDemand="true"
- dist:title="@string/tab_management_module_title">
- <dist:fusing dist:include="true" />
- </dist:module>
-</manifest>
-
diff --git a/chrome/android/modules/cablev2_authenticator/DIR_METADATA b/chrome/android/modules/cablev2_authenticator/DIR_METADATA
deleted file mode 100644
index 320051b..0000000
--- a/chrome/android/modules/cablev2_authenticator/DIR_METADATA
+++ /dev/null
@@ -1,7 +0,0 @@
-monorail: {
- component: "Blink>WebAuthentication"
-}
-team_email: "identity-dev@chromium.org"
-buganizer_public: {
- component_id: 1456855
-}
diff --git a/chrome/android/modules/cablev2_authenticator/OWNERS b/chrome/android/modules/cablev2_authenticator/OWNERS
deleted file mode 100644
index dd5ad77..0000000
--- a/chrome/android/modules/cablev2_authenticator/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-file://device/fido/OWNERS
diff --git a/chrome/android/modules/cablev2_authenticator/cablev2_authenticator_module.gni b/chrome/android/modules/cablev2_authenticator/cablev2_authenticator_module.gni
deleted file mode 100644
index ac917f2..0000000
--- a/chrome/android/modules/cablev2_authenticator/cablev2_authenticator_module.gni
+++ /dev/null
@@ -1,10 +0,0 @@
-cablev2_authenticator_module_desc = {
- name = "cablev2_authenticator"
- android_manifest = "//chrome/android/modules/cablev2_authenticator/internal/java/AndroidManifest.xml"
- java_deps = [ "//chrome/android/modules/cablev2_authenticator/internal:java" ]
- native_deps =
- [ "//chrome/android/modules/cablev2_authenticator/internal:native" ]
- jni_registration = "//chrome/android/modules/cablev2_authenticator/internal:cablev2_authenticator__jni_registration($default_toolchain)"
- load_native_on_get_impl = true
- uses_split = "chrome"
-}
diff --git a/chrome/android/modules/cablev2_authenticator/internal/BUILD.gn b/chrome/android/modules/cablev2_authenticator/internal/BUILD.gn
deleted file mode 100644
index a32f45d..0000000
--- a/chrome/android/modules/cablev2_authenticator/internal/BUILD.gn
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2020 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/android/rules.gni")
-import("//chrome/android/modules/buildflags.gni")
-import("//third_party/jni_zero/jni_zero.gni")
-
-android_library("java") {
- sources = [ "java/src/org/chromium/chrome/modules/cablev2_authenticator/ModuleImpl.java" ]
- deps = [
- "//chrome/android/features/cablev2_authenticator:java",
- "//chrome/android/modules/cablev2_authenticator/public:java",
- "//third_party/androidx:androidx_fragment_fragment_java",
- ]
-}
-
-# This group is effectively alias representing the module's native code,
-# allowing it to be named "native" for clarity in module descriptors. The
-# component target must be named according to the feature, so that the
-# component build's .cr.co library is named properly (ie.
-# libcablev2_authenticator.cr.so).
-group("native") {
- deps = [ ":cablev2_authenticator" ]
-}
-
-component_with_jni("cablev2_authenticator") {
- java_targets = [ ":java" ]
- sources = [ "entrypoints.cc" ]
- deps = [
- "//base",
- "//chrome/android/features/cablev2_authenticator:native",
- "//third_party/jni_zero",
- ]
-
- # caBLE v2 authenticator native entrypoints belong in the partition.
- if (use_native_partitions) {
- cflags = [ "-fsymbol-partition=cablev2_authenticator_partition" ]
- }
- manual_jni_registration = true
- namespace = "cablev2_authenticator"
- module_name = "cablev2_authenticator"
-}
diff --git a/chrome/android/modules/cablev2_authenticator/internal/entrypoints.cc b/chrome/android/modules/cablev2_authenticator/internal/entrypoints.cc
deleted file mode 100644
index a28024f..0000000
--- a/chrome/android/modules/cablev2_authenticator/internal/entrypoints.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2020 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/android/jni_utils.h"
-#include "chrome/android/modules/cablev2_authenticator/internal/cablev2_authenticator__jni_registration_generated.h"
-#include "third_party/jni_zero/jni_zero.h"
-
-extern "C" {
-// This JNI registration method is found and called by module framework code.
-JNI_BOUNDARY_EXPORT bool JNI_OnLoad_cablev2_authenticator(JNIEnv* env) {
- if (!cablev2_authenticator::RegisterNatives(env)) {
- return false;
- }
- return true;
-}
-
-} // extern "C"
diff --git a/chrome/android/modules/cablev2_authenticator/internal/java/AndroidManifest.xml b/chrome/android/modules/cablev2_authenticator/internal/java/AndroidManifest.xml
deleted file mode 100644
index 72a3533..0000000
--- a/chrome/android/modules/cablev2_authenticator/internal/java/AndroidManifest.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:dist="http://schemas.android.com/apk/distribution"
- featureSplit="cablev2_authenticator">
-
- <!-- dist:onDemand="true" makes this a separately installed module.
- dist:onDemand="false" would always install the module alongside the
- rest of Chrome. -->
- <dist:module
- dist:onDemand="false"
- dist:title="@string/cablev2_authenticator_module_title">
- <!-- This will fuse the module into the base APK if a system image
- APK is built from this bundle. -->
- <dist:fusing dist:include="true" />
- </dist:module>
-
- <application/>
-</manifest>
diff --git a/chrome/android/modules/cablev2_authenticator/internal/java/src/org/chromium/chrome/modules/cablev2_authenticator/ModuleImpl.java b/chrome/android/modules/cablev2_authenticator/internal/java/src/org/chromium/chrome/modules/cablev2_authenticator/ModuleImpl.java
deleted file mode 100644
index 194b0f9..0000000
--- a/chrome/android/modules/cablev2_authenticator/internal/java/src/org/chromium/chrome/modules/cablev2_authenticator/ModuleImpl.java
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2020 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.modules.cablev2_authenticator;
-
-import androidx.fragment.app.Fragment;
-
-import org.chromium.chrome.browser.webauth.authenticator.CableAuthenticatorUI;
-
-/**
- * This is the implementation of the interface to the caBLE v2 Authenticator module. It should
- * never be accessed directly, only by the module infrastructure machinery. (It's required to be
- * public for that machinery to function.)
- */
-public class ModuleImpl implements Module {
- @Override
- public Fragment getFragment() {
- return new CableAuthenticatorUI();
- }
-}
diff --git a/chrome/android/modules/cablev2_authenticator/public/BUILD.gn b/chrome/android/modules/cablev2_authenticator/public/BUILD.gn
deleted file mode 100644
index 30699f6..0000000
--- a/chrome/android/modules/cablev2_authenticator/public/BUILD.gn
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2020 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/android/rules.gni")
-
-android_library("java") {
- sources = [
- "java/src/org/chromium/chrome/modules/cablev2_authenticator/Module.java",
- ]
- deps = [
- "//components/module_installer/android:module_installer_java",
- "//components/module_installer/android:module_interface_java",
- "//third_party/androidx:androidx_fragment_fragment_java",
- ]
- annotation_processor_deps =
- [ "//components/module_installer/android:module_interface_processor" ]
-}
diff --git a/chrome/android/modules/cablev2_authenticator/public/java/src/org/chromium/chrome/modules/cablev2_authenticator/Module.java b/chrome/android/modules/cablev2_authenticator/public/java/src/org/chromium/chrome/modules/cablev2_authenticator/Module.java
deleted file mode 100644
index 84f7a1c..0000000
--- a/chrome/android/modules/cablev2_authenticator/public/java/src/org/chromium/chrome/modules/cablev2_authenticator/Module.java
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2020 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.modules.cablev2_authenticator;
-
-import androidx.fragment.app.Fragment;
-
-import org.chromium.components.module_installer.builder.ModuleInterface;
-
-/**
- * The interface to the dynamically installable module for the caBLE v2 authenticator. See {@link
- * ModuleInterface} for the interface to the synthesized class called "Cablev2AuthenticatorModule"
- * that will be generated to manage the module.
- *
- * Use {@link CableAuthenticatorInstaller} to access this module from outside of this package.
- */
-@ModuleInterface(
- module = "cablev2_authenticator",
- impl = "org.chromium.chrome.modules.cablev2_authenticator.ModuleImpl")
-public interface Module {
- /** Returns a {@link Fragment} that contains the authenticator UI. */
- public Fragment getFragment();
-}
diff --git a/chrome/android/modules/chrome_feature_modules.gni b/chrome/android/modules/chrome_feature_modules.gni
index a54de02a..e3cd654 100644
--- a/chrome/android/modules/chrome_feature_modules.gni
+++ b/chrome/android/modules/chrome_feature_modules.gni
@@ -9,10 +9,6 @@
import("//chrome/android/modules/test_dummy/test_dummy_module.gni")
import("//device/vr/buildflags/buildflags.gni")
-if (enable_arcore) {
- import("//chrome/android/features/ar/ar_module.gni")
-}
-
# List of feature module descs for each Chrome flavor. These lists are used to
# autogenerate the relevant module targets and bundles. A feature module desc
# is a GN scope with the following fields:
@@ -38,9 +34,6 @@
if (dfmify_dev_ui) {
chrome_module_descs += [ dev_ui_module_desc ]
}
-if (false) { # AR DFM is currently disabled
- chrome_module_descs += [ ar_module_desc ]
-}
monochrome_module_descs = chrome_module_descs
