diff options
| author | Yuntao Xu <yuntaoxu@google.com> | 2021-10-27 23:43:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-27 23:43:09 +0000 |
| commit | ae6fe28c01d8781fbe6971bfe10e440c901caf0c (patch) | |
| tree | 2dedb2bf64c8c35b363dd7a9148b97fed8c1fa8f | |
| parent | 7327f9aa51d289713d7918cabbf9acf038b8134d (diff) | |
| parent | e93aa086d936ee767fb379f9582552e221b290fd (diff) | |
| download | pdk-ae6fe28c01d8781fbe6971bfe10e440c901caf0c.tar.gz | |
Merge "Convert TestingCamera2/Android.mk to Android.bp" am: 88b335f9d1 am: 509a821095 am: c0a198e2f4 am: e93aa086d9
Original change: https://android-review.googlesource.com/c/platform/pdk/+/1863453
Change-Id: I4cb9c96524188a380c09953f4d78d47e0f0c2592
| -rw-r--r-- | apps/TestingCamera2/Android.bp | 31 | ||||
| -rw-r--r-- | apps/TestingCamera2/Android.mk | 40 |
2 files changed, 31 insertions, 40 deletions
diff --git a/apps/TestingCamera2/Android.bp b/apps/TestingCamera2/Android.bp new file mode 100644 index 0000000..f1cc960 --- /dev/null +++ b/apps/TestingCamera2/Android.bp @@ -0,0 +1,31 @@ +// Copyright (C) 2013 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: "TestingCamera2", + sdk_version: "current", + min_sdk_version: "28", + static_libs: ["android-ex-camera2"], + srcs: [ + "src/**/*.java", + ], + dex_preopt: { + enabled: false, + }, +} diff --git a/apps/TestingCamera2/Android.mk b/apps/TestingCamera2/Android.mk deleted file mode 100644 index 57f1790..0000000 --- a/apps/TestingCamera2/Android.mk +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (C) 2013 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. - -ifeq ($(TARGET_BUILD_JAVA_SUPPORT_LEVEL),platform) - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_SDK_VERSION := current -LOCAL_MIN_SDK_VERSION := 19 - -LOCAL_STATIC_JAVA_LIBRARIES := android-ex-camera2 - -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src) \ - $(call all-renderscript-files-under, src) - -LOCAL_DEX_PREOPT := false - -LOCAL_PACKAGE_NAME := TestingCamera2 -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice - -include $(BUILD_PACKAGE) - -endif |