Merge "Convert Camera2 to Soong" am: 04ca072c3d am: b3a00ef0e7 am: b7f8740495

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2029263

Change-Id: Ie8e596c209e5295daf552157b7f637d8a0cbf039

2 files changed, 62 insertions, 54 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 000000000..a3cad5888
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,62 @@
+//
+// Copyright (C) 2013 Google Inc.
+//
+
+package {
+    // See: http://go/android-license-faq
+    default_applicable_licenses: [
+        "Android-Apache-2.0",
+    ],
+}
+
+android_app {
+    name: "Camera2",
+
+    static_libs: [
+        "androidx.legacy_legacy-support-v13",
+        "androidx.legacy_legacy-support-v4",
+        "androidx.core_core",
+        "android-ex-camera2-portability",
+        "xmp_toolkit",
+        "glide",
+        "guava",
+        "jsr305",
+    ],
+
+    optional_uses_libs: ["org.apache.http.legacy"],
+
+    srcs: [
+        "src/**/*.java",
+        "src_pd/**/*.java",
+        "src_pd_gcam/**/*.java",
+    ],
+
+    resource_dirs: [
+        "res",
+        "res_p",
+    ],
+
+    aaptflags: [
+        "--auto-add-overlay",
+        "--version-name",
+        "2.0.002",
+        "--version-code",
+        "20002000",
+    ],
+
+    sdk_version: "current",
+
+    product_specific: true,
+
+    optimize: {
+        proguard_flags_files: ["proguard.flags"],
+    },
+
+    // Guava uses deprecated org.apache.http.legacy classes.
+    libs: ["org.apache.http.legacy"],
+
+    jni_libs: [
+        "libjni_tinyplanet",
+        "libjni_jpegutil",
+    ],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 509fbd4e3..000000000
--- a/Android.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_STATIC_ANDROID_LIBRARIES := \
-    androidx.legacy_legacy-support-v13 \
-    androidx.legacy_legacy-support-v4 \
-    androidx.core_core
-
-LOCAL_STATIC_JAVA_LIBRARIES := android-ex-camera2-portability
-LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
-LOCAL_STATIC_JAVA_LIBRARIES += glide
-LOCAL_STATIC_JAVA_LIBRARIES += guava
-LOCAL_STATIC_JAVA_LIBRARIES += jsr305
-
-LOCAL_USES_LIBRARIES := org.apache.http.legacy
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
-LOCAL_SRC_FILES += $(call all-java-files-under, src_pd_gcam)
-
-LOCAL_RESOURCE_DIR += \
-	$(LOCAL_PATH)/res \
-	$(LOCAL_PATH)/res_p
-
-include $(LOCAL_PATH)/version.mk
-
-LOCAL_AAPT_FLAGS := \
-        --auto-add-overlay \
-        --version-name "$(version_name_package)" \
-        --version-code $(version_code_package) \
-
-LOCAL_USE_AAPT2 := true
-
-LOCAL_PACKAGE_NAME := Camera2
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-
-LOCAL_SDK_VERSION := current
-
-LOCAL_PRODUCT_MODULE := true
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-# Guava uses deprecated org.apache.http.legacy classes.
-LOCAL_JAVA_LIBRARIES += org.apache.http.legacy
-
-LOCAL_JNI_SHARED_LIBRARIES := libjni_tinyplanet libjni_jpegutil
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under, $(LOCAL_PATH))