commit 48eb9aa8dbd18b483403c0ca3305237837613a3a
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 21 07:10:08 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 21 07:10:08 2020 +0000
tree 3f2369091795c19b229acf165c4e52b166d27f91
parent 98cc0e6b452955a8cbdbae86e31c6737c8e7768e
parent cd8871630bbf21973e3a23d581e07162287d60f5

Merge "Set sdk_version for libmediabenchmark JNI libraries" am: cd8871630b

Change-Id: I6b3720fea172ee077aad2ee24833ab1f19554ce8

media/tests/benchmark/MediaBenchmarkTest/src/main/cpp/Android.bp

diff --git a/media/tests/benchmark/MediaBenchmarkTest/src/main/cpp/Android.bp b/media/tests/benchmark/MediaBenchmarkTest/src/main/cpp/Android.bp
index c72eb55..3e5e4c8 100644
--- a/media/tests/benchmark/MediaBenchmarkTest/src/main/cpp/Android.bp
+++ b/media/tests/benchmark/MediaBenchmarkTest/src/main/cpp/Android.bp
@@ -1,5 +1,6 @@
 cc_test_library {
     name: "libmediabenchmark_jni",
+    sdk_version: "current",
 
     defaults: [
         "libmediabenchmark_common-defaults",

media/tests/benchmark/src/native/common/Android.bp

diff --git a/media/tests/benchmark/src/native/common/Android.bp b/media/tests/benchmark/src/native/common/Android.bp
index f8ea25c..d4389da 100644
--- a/media/tests/benchmark/src/native/common/Android.bp
+++ b/media/tests/benchmark/src/native/common/Android.bp
@@ -46,6 +46,8 @@
 
 cc_defaults {
     name: "libmediabenchmark-defaults",
+    sdk_version: "current",
+    stl: "c++_shared",
 
     shared_libs: [
         "libmediandk",