DO NOT MERGE: Remove AppSearch from Android R. am: 0b291791c8 am: 0c71d1f454 am: 7c06a370f9 (67eb54ee) · Commits · e / os / android_frameworks_base

Android.bp

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -282,7 +282,6 @@ filegroup {
	filegroup {		filegroup {
	name: "framework-updatable-sources",		name: "framework-updatable-sources",
	srcs: [		srcs: [
	":framework-appsearch-sources",
	":framework-sdkextensions-sources",		":framework-sdkextensions-sources",
	":framework-statsd-sources",		":framework-statsd-sources",
	":framework-tethering-srcs",		":framework-tethering-srcs",
	@@ -468,7 +467,6 @@ java_library {
	defaults: ["framework-defaults"],		defaults: ["framework-defaults"],
	srcs: [":framework-non-updatable-sources"],		srcs: [":framework-non-updatable-sources"],
	libs: [		libs: [
	"framework-appsearch-stubs",
	"framework-sdkextensions-stubs-systemapi",		"framework-sdkextensions-stubs-systemapi",
	"framework-statsd-stubs-module_libs_api",		"framework-statsd-stubs-module_libs_api",
	"framework-permission-stubs-systemapi",		"framework-permission-stubs-systemapi",
	@@ -494,7 +492,6 @@ java_library {
	visibility: [		visibility: [
	"//frameworks/base",		"//frameworks/base",
	// TODO(b/147128803) remove the below lines		// TODO(b/147128803) remove the below lines
	"//frameworks/base/apex/appsearch/framework",
	"//frameworks/base/apex/blobstore/framework",		"//frameworks/base/apex/blobstore/framework",
	"//frameworks/base/apex/jobscheduler/framework",		"//frameworks/base/apex/jobscheduler/framework",
	"//frameworks/base/packages/Tethering/tests/unit",		"//frameworks/base/packages/Tethering/tests/unit",
	@@ -516,7 +513,6 @@ java_library {
	installable: false, // this lib is a build-only library		installable: false, // this lib is a build-only library
	static_libs: [		static_libs: [
	"framework-minus-apex",		"framework-minus-apex",
	"framework-appsearch", // TODO(b/146218515): should be framework-appsearch-stubs
	"framework-media-stubs-systemapi",		"framework-media-stubs-systemapi",
	"framework-mediaprovider-stubs-systemapi",		"framework-mediaprovider-stubs-systemapi",
	"framework-permission-stubs-systemapi",		"framework-permission-stubs-systemapi",
	@@ -541,7 +537,6 @@ java_library {
	"exoplayer2-extractor",		"exoplayer2-extractor",
	"android.hardware.wifi-V1.0-java-constants",		"android.hardware.wifi-V1.0-java-constants",
	],		],
	libs: ["icing-java-proto-lite"],
	apex_available: ["//apex_available:platform"],		apex_available: ["//apex_available:platform"],
	visibility: [		visibility: [
	// DO NOT ADD ANY MORE ENTRIES TO THIS LIST		// DO NOT ADD ANY MORE ENTRIES TO THIS LIST
	@@ -562,7 +557,6 @@ java_library {
	libs: [		libs: [
	"app-compat-annotations",		"app-compat-annotations",
	"ext",		"ext",
	"icing-java-proto-lite",
	"unsupportedappusage",		"unsupportedappusage",
	],		],

apex/appsearch/Android.bp

deleted100644 → 0

+0 −37

Original line number	Original line	Diff line number	Diff line
	// Copyright (C) 2019 The Android Open Source Project
	//
	// Licensed under the Apache License, Version 2.0 (the "License");
	// you may not use this file except in compliance with the License.
	// You may obtain a copy of the License at
	//
	// http://www.apache.org/licenses/LICENSE-2.0
	//
	// Unless required by applicable law or agreed to in writing, software
	// distributed under the License is distributed on an "AS IS" BASIS,
	// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	// See the License for the specific language governing permissions and
	// limitations under the License.

	apex {
	name: "com.android.appsearch",
	manifest: "apex_manifest.json",
	java_libs: [
	"framework-appsearch",
	"service-appsearch",
	],
	key: "com.android.appsearch.key",
	certificate: ":com.android.appsearch.certificate",
	}

	apex_key {
	name: "com.android.appsearch.key",
	public_key: "com.android.appsearch.avbpubkey",
	private_key: "com.android.appsearch.pem",
	}

	android_app_certificate {
	name: "com.android.appsearch.certificate",
	// This will use com.android.appsearch.x509.pem (the cert) and
	// com.android.appsearch.pk8 (the private key)
	certificate: "com.android.appsearch",
	}

apex/appsearch/apex_manifest.json

deleted100644 → 0

+0 −4

Original line number	Original line	Diff line number	Diff line
	{
	"name": "com.android.appsearch",
	"version": 300000000
	}

apex/appsearch/com.android.appsearch.avbpubkey

deleted100644 → 0

−1.01 KiB

File deleted.

View file

apex/appsearch/com.android.appsearch.pem

deleted100644 → 0

+0 −51

Original line number	Original line	Diff line number	Diff line
	-----BEGIN RSA PRIVATE KEY-----
	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
	-----END RSA PRIVATE KEY-----