Merge "Convert Camera2/jni/Android.mk to Android.bp" am: 85a5b51324
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1700134
Change-Id: I08809fe28ed898ba9b9accd80d3ac2674437618f
diff --git a/jni/Android.bp b/jni/Android.bp
new file mode 100644
index 0000000..b71e81f
--- /dev/null
+++ b/jni/Android.bp
@@ -0,0 +1,71 @@
+package {
+ default_applicable_licenses: ["packages_apps_Camera2_license"],
+}
+
+// See: http://go/android-license-faq
+license {
+ name: "packages_apps_Camera2_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ ],
+ license_text: [
+ "NOTICE",
+ ],
+}
+
+// TinyPlanet
+cc_library_shared {
+ name: "libjni_tinyplanet",
+ shared_libs: [
+ "liblog",
+ "libjnigraphics",
+ ],
+ sdk_version: "17",
+ srcs: ["tinyplanet.cc"],
+ product_specific: true,
+ cflags: [
+ "-ffast-math",
+ "-O3",
+ "-funroll-loops",
+ "-Wextra",
+ ],
+ arch: {
+ arm: {
+ instruction_set: "arm",
+ },
+ },
+ // for including the jni.h file
+ header_libs: ["jni_headers"],
+}
+
+// JpegUtil
+cc_library_shared {
+ name: "libjni_jpegutil",
+ stl: "c++_static",
+ shared_libs: [
+ "liblog",
+ "libdl",
+ "libjnigraphics",
+ ],
+ sdk_version: "17",
+ product_specific: true,
+ srcs: [
+ "jpegutil.cpp",
+ "jpegutilnative.cpp",
+ ],
+ static_libs: ["libjpeg_static_ndk"],
+ cflags: [
+ "-ffast-math",
+ "-O3",
+ "-funroll-loops",
+ "-Wextra",
+ ],
+ arch: {
+ arm: {
+ instruction_set: "arm",
+ },
+ },
+ // for including the jni.h file
+ header_libs: ["jni_headers"],
+}
diff --git a/jni/Android.mk b/jni/Android.mk
deleted file mode 100644
index e2f6816..0000000
--- a/jni/Android.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-# TinyPlanet
-include $(CLEAR_VARS)
-
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_LDFLAGS := -llog -ljnigraphics
-LOCAL_SDK_VERSION := 17
-LOCAL_MODULE := libjni_tinyplanet
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
-LOCAL_SRC_FILES := tinyplanet.cc
-LOCAL_PRODUCT_MODULE := true
-
-LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops
-LOCAL_CFLAGS += -Wall -Wextra -Werror
-LOCAL_ARM_MODE := arm
-
-include $(BUILD_SHARED_LIBRARY)
-
-# JpegUtil
-include $(CLEAR_VARS)
-
-LOCAL_NDK_STL_VARIANT := c++_static
-LOCAL_LDFLAGS := -llog -ldl -ljnigraphics
-LOCAL_SDK_VERSION := 17
-LOCAL_MODULE := libjni_jpegutil
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
-LOCAL_PRODUCT_MODULE := true
-LOCAL_SRC_FILES := jpegutil.cpp jpegutilnative.cpp
-
-LOCAL_STATIC_LIBRARIES := libjpeg_static_ndk
-
-LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops
-LOCAL_CFLAGS += -Wall -Wextra -Werror
-LOCAL_ARM_MODE := arm
-
-include $(BUILD_SHARED_LIBRARY)
