From b971d34e294ee841a93cd0ab1c8b1f3dd7965906 Mon Sep 17 00:00:00 2001
From: Yuntao Xu <yuntaoxu@google.com>
Date: Tue, 19 Oct 2021 11:21:18 -0700
Subject: Convert TestingCamera2/Android.mk to Android.bp

Converted the Make file to a Soong one.

Bug: 202170767
Test: compared the two apk files built by Make and Soong
Test: TreeHugger
Change-Id: I7f4146abf5f0b4c804819abf7c14796c2b87f25b
---
 apps/TestingCamera2/Android.bp | 31 +++++++++++++++++++++++++++++++
 apps/TestingCamera2/Android.mk | 40 ----------------------------------------
 2 files changed, 31 insertions(+), 40 deletions(-)
 create mode 100644 apps/TestingCamera2/Android.bp
 delete mode 100644 apps/TestingCamera2/Android.mk

(limited to 'apps')

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
-- 
cgit v1.2.3