From cea8f23006076784b9516a191334c5f029c580d4 Mon Sep 17 00:00:00 2001 From: Etienne Ruffieux Date: Wed, 6 Jul 2022 23:07:34 -0700 Subject: [PATCH] Added platform_compat_config to enable target sdk check Bug: 232351962 Tag: #feature Test: atest CtsBluetoothTests Ignore-AOSP-First: change only in internal Change-Id: I66c0a83554d81f8a6a6956ec0a8a324be6b11033 (cherry picked from commit a82b0872e85476c9a96ef91b0556ac241352bac2) Merged-In: I66c0a83554d81f8a6a6956ec0a8a324be6b11033 --- apex/Android.bp | 2 ++ service/Android.bp | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/apex/Android.bp b/apex/Android.bp index 530a1468ef..3026a4ce01 100644 --- a/apex/Android.bp +++ b/apex/Android.bp @@ -21,6 +21,7 @@ apex { manifest: "apex_manifest.json", bootclasspath_fragments: ["com.android.btservices-bootclasspath-fragment"], systemserverclasspath_fragments: ["com.android.btservices-systemserverclasspath-fragment"], + compat_configs: ["bluetooth-compat-config"], apps: ["Bluetooth"], multilib: { @@ -55,6 +56,7 @@ apex { manifest: "apex_manifest.json", bootclasspath_fragments: ["com.android.btservices-bootclasspath-fragment"], systemserverclasspath_fragments: ["com.android.btservices-systemserverclasspath-fragment"], + compat_configs: ["bluetooth-compat-config"], apps: ["Bluetooth"], multilib: { diff --git a/service/Android.bp b/service/Android.bp index 79f3156885..ca76812d25 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -134,3 +134,9 @@ gensrcs { ], output_extension: "srcjar", } + +platform_compat_config +{ + name: "bluetooth-compat-config", + src: ":service-bluetooth-pre-jarjar", +}