Skip to content

Commit

Permalink
Build apps for CTS tests with sdk 31
Browse files Browse the repository at this point in the history
We need to run those CTS tests on older devices for mainline. It turns
out that min_sdk_version is not enough.

Also, the reporter app does not need to run on MTS, so there's no need
to build it for sdk 31.

Tested: built the test apps and installed them on older devices (it
failed before).

Tested: atest CtsPerfettoTestCases

Bug: 268041903
Bug: 272300250
(cherry picked from commit add8682518994108013b2fabda740746813ebab4)
Merged-In: Ic27539171f314dd6865944b0e7044a3e5a9f801e
Change-Id: Ic27539171f314dd6865944b0e7044a3e5a9f801e
  • Loading branch information
ddiproietto committed Mar 14, 2023
1 parent cb666ee commit cfc1351
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 10 deletions.
2 changes: 1 addition & 1 deletion test/cts/producer/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ android_test_helper_app {

compile_multilib: "both",
srcs: ["src/**/*.java"],
sdk_version: "current",
// This test is also run via Mainline Testing against the ART Mainline
// Module, which is updatable since Android 12 (API level 31).
sdk_version: "31",
min_sdk_version: "31",
jni_libs: [
"libperfettocts_jni",
Expand Down
2 changes: 0 additions & 2 deletions test/cts/producer/jni/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ cc_library_shared {
],
header_libs: ["jni_headers"],
static_libs: [
"libgtest",
"libprotobuf-cpp-lite",
"perfetto_cts_jni_deps",
"libperfetto_client_experimental",
],
Expand Down
3 changes: 0 additions & 3 deletions test/cts/reporter/app/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,4 @@ android_test_helper_app {
srcs: ["src/**/*.java"],
platform_apis: true,
privileged: true,
// This test is also run via Mainline Testing against the ART Mainline
// Module, which is updatable since Android 12 (API level 31).
min_sdk_version: "31",
}
8 changes: 4 additions & 4 deletions test/cts/test_apps/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ android_test_helper_app {

compile_multilib: "both",
srcs: ["src/**/*.java"],
sdk_version: "current",
// This test is also run via Mainline Testing against the ART Mainline
// Module, which is updatable since Android 12 (API level 31).
sdk_version: "31",
min_sdk_version: "31",
jni_libs: [
"libperfettocts_native",
Expand All @@ -57,9 +57,9 @@ android_test_helper_app {

compile_multilib: "both",
srcs: ["src/**/*.java"],
sdk_version: "current",
// This test is also run via Mainline Testing against the ART Mainline
// Module, which is updatable since Android 12 (API level 31).
sdk_version: "31",
min_sdk_version: "31",
jni_libs: [
"libperfettocts_native",
Expand All @@ -80,9 +80,9 @@ android_test_helper_app {

compile_multilib: "both",
srcs: ["src/**/*.java"],
sdk_version: "current",
// This test is also run via Mainline Testing against the ART Mainline
// Module, which is updatable since Android 12 (API level 31).
sdk_version: "31",
min_sdk_version: "31",
jni_libs: [
"libperfettocts_native",
Expand All @@ -103,9 +103,9 @@ android_test_helper_app {

compile_multilib: "both",
srcs: ["src/**/*.java"],
sdk_version: "current",
// This test is also run via Mainline Testing against the ART Mainline
// Module, which is updatable since Android 12 (API level 31).
sdk_version: "31",
min_sdk_version: "31",
jni_libs: [
"libperfettocts_native",
Expand Down

0 comments on commit cfc1351

Please sign in to comment.