commit cd8871630bbf21973e3a23d581e07162287d60f5
author Colin Cross <ccross@android.com> Fri Feb 21 06:58:48 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 21 06:58:48 2020 +0000
tree ea476deeb8c90714b10a68278fabe3838948b22e
parent 72f6c230796e9ee71c0eccedbcf72991efaa11dc
parent 91ecb1a6c7cf4d1c60876d38ecdf9f5857a36c0c

Merge "Set sdk_version for libmediabenchmark JNI libraries"

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",