summaryrefslogtreecommitdiff
path: root/drm
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2018-05-09 20:30:33 -0700
committerDan Willemsen <dwillemsen@google.com>2018-05-14 16:47:02 -0700
commit4888b1f6f0f607de913fbd0dc5eaed6575464c06 (patch)
tree662ea285f420c21f406e8dc09b6fbf42b7b28880 /drm
parent5d58a302e3dc3e63c1d5cc87807f29863e89b2a9 (diff)
Convert to Soong
See build/soong/README.md for more information. Test: m libframeworks_coretests_jni Test: m FrameworkCoreTests_install Test: m libshim_jni Test: m CtsShimPrivUpgrade Test: m libfilterfw Test: m PMTest_Java_dual Test: m libdefcontainer_jni Test: m libperftestscore_jni Test: m libpmtest32 libpmtest64 Test: m libprintspooler_jni Test: m libsmartcamera_jni Test: m idmap Test: m libdrmframework_jni Test: m libdvr_loader com.google.vr.platform com.google.vr.platform.xml Test: m libfilterpack_imageproc libfilterpack_base Test: m libwebviewchromium_loader Test: m shared_mem_test Test: m test-touchlag Change-Id: I868561dd237fa28647896d59049ab9260373ada1
Diffstat (limited to 'drm')
-rw-r--r--drm/jni/Android.bp38
-rw-r--r--drm/jni/Android.mk45
2 files changed, 38 insertions, 45 deletions
diff --git a/drm/jni/Android.bp b/drm/jni/Android.bp
new file mode 100644
index 000000000000..1e33f0ea5094
--- /dev/null
+++ b/drm/jni/Android.bp
@@ -0,0 +1,38 @@
+//
+// Copyright (C) 2010 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.
+//
+
+cc_library_shared {
+ name: "libdrmframework_jni",
+
+ srcs: ["android_drm_DrmManagerClient.cpp"],
+
+ shared_libs: [
+ "libdrmframework",
+ "liblog",
+ "libutils",
+ "libandroid_runtime",
+ "libnativehelper",
+ "libbinder",
+ "libdl",
+ ],
+
+ cflags: [
+ "-Wall",
+ "-Werror",
+ "-Wunused",
+ "-Wunreachable-code",
+ ],
+}
diff --git a/drm/jni/Android.mk b/drm/jni/Android.mk
deleted file mode 100644
index d0797a9849cd..000000000000
--- a/drm/jni/Android.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (C) 2010 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.
-#
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
- android_drm_DrmManagerClient.cpp
-
-LOCAL_MODULE:= libdrmframework_jni
-
-LOCAL_SHARED_LIBRARIES := \
- libdrmframework \
- liblog \
- libutils \
- libandroid_runtime \
- libnativehelper \
- libbinder \
- libdl
-
-LOCAL_STATIC_LIBRARIES :=
-
-LOCAL_C_INCLUDES += \
- $(JNI_H_INCLUDE) \
- $(TOP)/frameworks/av/drm/libdrmframework/include \
- $(TOP)/frameworks/av/drm/libdrmframework/plugins/common/include \
- $(TOP)/frameworks/av/include \
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
-
-include $(BUILD_SHARED_LIBRARY)