commit 9eb54ab3f7f35d1696ca650d02a0657620d25f09
author Orion Hodson <oth@google.com> Wed Jun 03 07:55:29 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 03 07:55:29 2020 +0000
tree 5dacf713c98d8653a2fab24cc4edc5f38c662ddb
parent 7a43d7533f2581c3309d4d937e007f9a31719726
parent 5c465fff5e34624ae9be6bf5456e32b035cb2a07

Merge changes from topic "no-platform-app-glue" am: 5c465fff5e

Original change: https://android-review.googlesource.com/c/platform/tools/test/graphicsbenchmark/+/1291294

Change-Id: Ifc59b3559529fe64014ba9015348169e54b4444f

apps/sample_app/Android.bp

diff --git a/apps/sample_app/Android.bp b/apps/sample_app/Android.bp
index b43a484..cf786f4 100644
--- a/apps/sample_app/Android.bp
+++ b/apps/sample_app/Android.bp
@@ -15,6 +15,7 @@
 cc_library_shared {
     name: "libgamecore_sample",
     sdk_version: "26",
+    sdk_variant_only: true,
     srcs: [
         "src/cpp/circle.cpp",
         "src/cpp/common.cpp",

functional_tests/java/Android.bp

diff --git a/functional_tests/java/Android.bp b/functional_tests/java/Android.bp
index 4f60661..ce4f295 100644
--- a/functional_tests/java/Android.bp
+++ b/functional_tests/java/Android.bp
@@ -15,6 +15,7 @@
 cc_test_library {
     name: "libgamecore_java_tests_jni",
     sdk_version: "26", // Oreo
+    sdk_variant_only: true,
     srcs: ["src/cpp/surface_flinger_test_activity.cpp", "src/cpp/native_choreo_activity.cpp",],
     stl: "c++_shared",
     header_libs: ["jni_headers"],