Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into... (ca4c520f) · Commits · e / os / android_frameworks_base

.gitignore

+1 −0

+185 −18

File changed.

Preview size limit exceeded, changes collapsed.

+4 −1

Original line number	Diff line number	Diff line
		@@ -248,8 +248,11 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.mediad
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.location.provider.jar)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.future.usb.accessory.jar)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.media.remotedisplay.jar)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/SystemUI)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/DynamicAndroidInstallationService)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/DefaultContainerService)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/CaptivePortalLogin)
		# ******************************************************************
		# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER
		# ******************************************************************

+2 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,8 @@ hidden_api_txt_checksorted_hook = ${REPO_ROOT}/frameworks/base/tools/hiddenapi/c

		hidden_api_txt_exclude_hook = ${REPO_ROOT}/frameworks/base/tools/hiddenapi/exclude.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}

		ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py -f ${PREUPLOAD_FILES}

		owners_hook = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} "OWNERS$"

		shell_hook = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} "^packages/Shell/"

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		// Copyright (C) 2018 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.

		android_test {
		name: "AutofillPerfTests",
		srcs: ["src/*/.java"],
		resource_dirs: ["res"],
		static_libs: [
		"androidx.test.rules",
		"androidx.annotation_annotation",
		"apct-perftests-utils",
		],
		platform_apis: true,
		test_suites: ["device-tests"],
		}