From 62859fd7bb9d12678cdc70eb699fb21cb97f7bbe Mon Sep 17 00:00:00 2001
From: Harish Mahendrakar <harish.mahendrakar@ittiam.com>
Date: Thu, 26 Dec 2019 11:46:19 -0800
Subject: [PATCH] Benchmark: Remove stl and sdk_version from Android.bp

Bug: 146816684
Test: adb shell am instrument -w -r -e debug false -e class\
      'com.android.media.benchmark.tests.ExtractorTest#sampleExtractNativeTest' \
      com.android.media.benchmark/androidx.test.runner.AndroidJUnitRunner
Test: encoderTest -P /data/local/tmp/MediaBenchmark/res/

Change-Id: I2fb719151426231770e66376a9a14a9f0c903c16
---
 .../benchmark/MediaBenchmarkTest/src/main/cpp/Android.bp      | 4 ----
 media/tests/benchmark/src/native/common/Android.bp            | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/media/tests/benchmark/MediaBenchmarkTest/src/main/cpp/Android.bp b/media/tests/benchmark/MediaBenchmarkTest/src/main/cpp/Android.bp
index a10d6b1e17..c72eb553ab 100644
--- a/media/tests/benchmark/MediaBenchmarkTest/src/main/cpp/Android.bp
+++ b/media/tests/benchmark/MediaBenchmarkTest/src/main/cpp/Android.bp
@@ -17,8 +17,6 @@ cc_test_library {
         "liblog",
     ],
 
-    sdk_version: "current",
-
     static_libs: [
         "libmediabenchmark_common",
         "libmediabenchmark_extractor",
@@ -27,8 +25,6 @@ cc_test_library {
         "libmediabenchmark_encoder",
     ],
 
-    stl: "c++_static",
-
     cflags: [
         "-Wall",
         "-Werror",
diff --git a/media/tests/benchmark/src/native/common/Android.bp b/media/tests/benchmark/src/native/common/Android.bp
index 6f7ffe6028..f8ea25c447 100644
--- a/media/tests/benchmark/src/native/common/Android.bp
+++ b/media/tests/benchmark/src/native/common/Android.bp
@@ -52,10 +52,6 @@ cc_defaults {
         "liblog",
     ],
 
-    stl: "libc++_static",
-
-    sdk_version: "current",
-
     cflags: [
         "-Wall",
         "-Werror",