diff options
author | Yuntao Xu <yuntaoxu@google.com> | 2021-04-30 18:02:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-30 18:02:37 +0000 |
commit | 3dbb547fc2ad6556b747e8b6e770f31228b023ab (patch) | |
tree | d51fe2c9b495971f9cde4ab36814184d070aa0b7 | |
parent | b7529718e5650816bf1b9dd063f6b1f21be1bf5c (diff) | |
parent | a927501359e84981c733122f582aec6511169275 (diff) | |
download | android-3dbb547fc2ad6556b747e8b6e770f31228b023ab.tar.gz |
Merge "Convert src/main/Android.mk to Android.bp" am: 3c3a5d95b6 am: 8184c3c810 am: a927501359android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1690211
Change-Id: I233f2c5cea9ef78f64d963c4a9d10234723a6676
-rw-r--r-- | security/FingerprintDialog/Application/src/main/Android.bp | 37 | ||||
-rw-r--r-- | security/FingerprintDialog/Application/src/main/Android.mk | 33 |
2 files changed, 37 insertions, 33 deletions
diff --git a/security/FingerprintDialog/Application/src/main/Android.bp b/security/FingerprintDialog/Application/src/main/Android.bp new file mode 100644 index 00000000..8fd208f0 --- /dev/null +++ b/security/FingerprintDialog/Application/src/main/Android.bp @@ -0,0 +1,37 @@ +// Copyright (C) 2016 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. + +package { + // See: http://go/android-license-faq + default_applicable_licenses: ["Android-Apache-2.0"], +} + +android_app { + name: "FingerprintDialog", + static_libs: [ + "androidx.appcompat_appcompat", + "androidx.legacy_legacy-support-v4", + "androidx.annotation_annotation", + ], + srcs: ["**/*.java"], + sdk_version: "current", + resource_dirs: [ + "res", + ], + aaptflags: [ + "--auto-add-overlay", + "--extra-packages", + "android.support.v7.appcompat", + ], +} diff --git a/security/FingerprintDialog/Application/src/main/Android.mk b/security/FingerprintDialog/Application/src/main/Android.mk deleted file mode 100644 index 796e182f..00000000 --- a/security/FingerprintDialog/Application/src/main/Android.mk +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (C) 2016 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. - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) -LOCAL_USE_AAPT2 := true -LOCAL_STATIC_ANDROID_LIBRARIES := \ - androidx.appcompat_appcompat \ - androidx.legacy_legacy-support-v4 \ - androidx.annotation_annotation -LOCAL_MODULE_TAGS := samples -LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_PACKAGE_NAME := FingerprintDialog -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_SDK_VERSION := current -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \ - prebuilts/sdk/current/support/v7/appcompat/res -LOCAL_AAPT_FLAGS := --auto-add-overlay \ - --extra-packages android.support.v7.appcompat - -include $(BUILD_PACKAGE) |