universal7580: libshims: convert libstagefright_shim to Android.bp
authorJan Altensen <info@stricted.net>
Tue, 10 Sep 2019 09:30:07 +0000 (11:30 +0200)
committerDanny Wood <danwood76@gmail.com>
Tue, 10 Mar 2020 15:25:55 +0000 (15:25 +0000)
Change-Id: I53afe64ad195258c7ba097d776fc1fa67b2dacff

libshims/libstagefright/Android.bp [new file with mode: 0644]
libshims/libstagefright/Android.mk [deleted file]

diff --git a/libshims/libstagefright/Android.bp b/libshims/libstagefright/Android.bp
new file mode 100644 (file)
index 0000000..0f2236c
--- /dev/null
@@ -0,0 +1,37 @@
+cc_library_shared {
+    name: "libstagefright_shim",
+    proprietary: true,
+    
+    srcs: [
+        "CameraSource.cpp",
+    ],
+
+    export_shared_lib_headers: [
+        "android.hardware.graphics.bufferqueue@1.0",
+        "android.hardware.graphics.bufferqueue@2.0",
+    ],
+
+    generated_headers: [
+        "android.hardware.graphics.bufferqueue@1.0_genc++_headers",
+        "android.hardware.graphics.bufferqueue@2.0_genc++_headers",
+    ],
+
+    shared_libs: [
+        "android.hardware.graphics.bufferqueue@1.0",
+        "android.hardware.graphics.bufferqueue@2.0",
+        "android.hidl.token@1.0-utils",
+        "libbase",
+        "libcamera_client",
+        "liblog",
+    ],
+
+    include_dirs: [
+        "frameworks/av/include",
+        "frameworks/native/include/media/hardware",
+        "frameworks/native/include/media/openmax",
+        "frameworks/native/libs/arect/include",
+        "frameworks/native/libs/nativebase/include",
+        "frameworks/native/libs/nativewindow/include",
+        "frameworks/av/media/ndk/include",
+    ],
+}
diff --git a/libshims/libstagefright/Android.mk b/libshims/libstagefright/Android.mk
deleted file mode 100644 (file)
index a1b1983..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (C) 2018 The LineageOS 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_SRC_FILES := CameraSource.cpp
-
-LOCAL_C_INCLUDES := \
-    $(TOP)/frameworks/av/include \
-    $(TOP)/frameworks/native/include/media/hardware \
-    $(TOP)/frameworks/native/include/media/openmax \
-    $(TOP)/frameworks/native/libs/arect/include \
-    $(TOP)/frameworks/native/libs/nativebase/include
-
-LOCAL_SHARED_LIBRARIES := \
-    android.hardware.graphics.bufferqueue@1.0 \
-    android.hidl.token@1.0-utils \
-    libbase \
-    libcamera_client \
-    liblog
-
-LOCAL_MODULE := libstagefright_shim
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_PROPRIETARY_MODULE := true
-
-include $(BUILD_SHARED_LIBRARY)