Skip to content

GitLab

T
tangled
Commit c98dded5 authored by Robbie McElrath's avatar Robbie McElrath Committed by Commit Bot
Browse files
Options

[AW] Delete //aw/apk now that downstream doesn't depend on it 

crrev.com/c/1900130 renamed //aw/apk to //aw/nonembedded, and
crrev.com/i/2103749 removed the last //aw/apk dependencies. Now that the
latter CL has landed, we can delete //aw/apk.

Test: ninja -C out/aw
Bug: 934152
Change-Id: I1e5322adfda9813d296ca0f027a75463db18efc3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1913597Reviewed-by: default avatarChangwan Ryu <changwan@chromium.org>
Commit-Queue: Robbie McElrath <rmcelrath@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715429}
parent 4717f2a2
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 150 deletions
android_webview/apk/BUILD.gn deleted 100644 → 0
View file @ 4717f2a2
# Copyright 2017 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.
# TODO(crbug.com/934152): Delete //android_webview/apk once downstream is updated
import("//build/config/android/rules.gni")
group("system_webview_manifest") {
deps = [
"//android_webview/nonembedded:system_webview_manifest",
]
}
android_library("apk_java") {
java_files =
[ "java/src/com/android/webview/chromium/WebViewApkApplication.java" ]
deps = [
"//android_webview/nonembedded:nonembedded_java",
]
}
android_webview/apk/java/AndroidManifest.xml deleted 100644 → 0
View file @ 4717f2a2
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2012 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.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="{{manifest_package|default('com.android.webview')}}"
tools:ignore="MissingLeanbackLauncher">
<uses-feature android:name="android.hardware.touchscreen"
android:required="false" />
<uses-feature android:name="android.software.leanback"
android:required="false" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<application android:label="{{ application_label|default('Android System WebView') }}"
android:icon="@{{manifest_package|default('com.android.webview')}}:drawable/icon_webview"
android:name="{{ application_name|default('org.chromium.android_webview.nonembedded.WebViewApkApplication') }}"
android:multiArch="true"
{{ use32bitAbi|default('android:use32bitAbi="true"') }}
android:extractNativeLibs="{{ trichrome_library is not defined }}">
{# This part is shared between stand-alone WebView and Monochrome #}
{% macro common(manifest_package, webview_lib) %}
<meta-data android:name="com.android.webview.WebViewLibrary"
android:value="{{ webview_lib }}" />
<!-- WebView Developer UI Activities -->
<!--suppress HardcodedText -->
<activity android:name="org.chromium.android_webview.devui.MainActivity"
android:label="WebView DevTools"
android:theme="@style/Theme.DevUi.DayNight"
android:launchMode="singleTask"
android:process=":webview_apk"> {# Explicit process required for monochrome compatibility. #}
<intent-filter>
<action android:name="com.android.webview.SHOW_DEV_UI" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name="org.chromium.android_webview.devui.CrashesListActivity"
android:label="WebView Crashes"
android:theme="@style/Theme.DevUi.DayNight"
android:launchMode="singleTop"
android:process=":webview_apk"> {# Explicit process required for monochrome compatibility. #}
</activity>
<activity android:name="org.chromium.android_webview.devui.FlagsActivity"
android:label="WebView Flags"
android:theme="@style/Theme.DevUi.DayNight"
android:launchMode="singleTop"
android:process=":webview_apk"> {# Explicit process required for monochrome compatibility. #}
</activity>
<!-- End of WebView Developer UI Activities -->
<activity android:name="org.chromium.android_webview.nonembedded.LicenseActivity"
android:label="@string/license_activity_title"
android:process=":webview_apk"> {# Explicit process required for monochrome compatibility. #}
<intent-filter>
<action android:name="android.settings.WEBVIEW_LICENSE" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity>
<provider android:name="org.chromium.android_webview.nonembedded.LicenseContentProvider"
android:exported="true"
android:authorities="{{ manifest_package }}.LicenseContentProvider"
android:process=":webview_apk" /> {# Explicit process required for monochrome compatibility. #}
{% if donor_package is not defined %}
<!-- If you change the variations services, also see
android_webview/test/shell/AndroidManifest.xml. -->
<!-- These have a separate android:process so that they can
run in Monochrome with a different value for
PathUtils.getDataDirectory() from Chrome. -->
<service android:name="org.chromium.android_webview.services.VariationsSeedServer"
android:exported="true"
android:process=":webview_service" /> {# Explicit process required for monochrome compatibility. #}
<service android:name="org.chromium.android_webview.services.AwVariationsSeedFetcher"
android:permission="android.permission.BIND_JOB_SERVICE"
android:exported="false"
android:process=":webview_service" /> {# Explicit process required for monochrome compatibility. #}
<service android:name="org.chromium.android_webview.services.CrashReceiverService"
android:exported="true"
android:process=":webview_service" /> {# Explicit process required for monochrome compatibility. #}
<service android:name="org.chromium.android_webview.services.AwMinidumpUploadJobService"
android:permission="android.permission.BIND_JOB_SERVICE"
android:exported="true"
android:process=":webview_service" /> {# Explicit process required for monochrome compatibility. #}
{% endif %}
{% endmacro %}
{{ common(manifest_package|default('com.android.webview'), library|default('libwebviewchromium.so')) }}
{% if donor_package is defined %}
<meta-data android:name="com.android.webview.WebViewDonorPackage"
android:value="{{ donor_package }}" />
{% endif %}
{% set num_sandboxed_services = 40 %}
<meta-data android:name="org.chromium.content.browser.NUM_SANDBOXED_SERVICES"
android:value="{{ num_sandboxed_services }}" />
{% for i in range(num_sandboxed_services) %}
<service android:name="org.chromium.content.app.SandboxedProcessService{{ i }}"
android:process=":sandboxed_process{{ i }}"
android:isolatedProcess="true"
android:exported="true"
android:externalService="true"
tools:ignore="ExportedService"
android:visibleToInstantApps="true" />
{% endfor %}
<meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SERVICES"
android:value="0" />
{% if trichrome_library is defined %}
<uses-static-library
android:name="{{ trichrome_library }}"
android:version="{{ trichrome_version }}"
android:certDigest="{{ trichrome_certdigest }}" />
{% endif %}
</application>
</manifest>
android_webview/apk/java/src/com/android/webview/chromium/WebViewApkApplication.java deleted 100644 → 0
View file @ 4717f2a2
// Copyright 2018 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.
package com.android.webview.chromium;
// TODO(crbug.com/934152): Delete this once Clank points to the new WebViewApkApplication package.
public class WebViewApkApplication
extends org.chromium.android_webview.nonembedded.WebViewApkApplication {}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment