diff options
| author | 2024-06-28 11:48:57 +0100 | |
|---|---|---|
| committer | 2024-07-02 10:37:49 +0000 | |
| commit | 0933278fc41c81f6768b806360422ce95c8f7b10 (patch) | |
| tree | b51823c1ba8cb47d698248bc688a5306e3759536 | |
| parent | f513aece93f7b19bbe1ba01d97340d41468fcbbc (diff) | |
Use art-aconfig-flags in service-art
Bug: 349108429
Test: art/tools/buildbot-build.sh on master-art
Change-Id: Id1c0fdbdd0a89cccebdf5677b0d6e1e59c0e1291
| -rw-r--r-- | build/flags/Android.bp | 12 | ||||
| -rw-r--r-- | libartservice/service/Android.bp | 9 |
2 files changed, 20 insertions, 1 deletions
diff --git a/build/flags/Android.bp b/build/flags/Android.bp index bbd82be548..239b86232d 100644 --- a/build/flags/Android.bp +++ b/build/flags/Android.bp @@ -36,3 +36,15 @@ cc_aconfig_library { "//apex_available:anyapex", ], } + +java_aconfig_library { + name: "art-aconfig-flags-java-lib", + aconfig_declarations: "art-aconfig-flags", + host_supported: true, + sdk_version: "core_current", + min_sdk_version: "31", + apex_available: [ + "//apex_available:platform", + "//apex_available:anyapex", + ], +} diff --git a/libartservice/service/Android.bp b/libartservice/service/Android.bp index 8204d14672..b21f64642c 100644 --- a/libartservice/service/Android.bp +++ b/libartservice/service/Android.bp @@ -94,6 +94,7 @@ java_defaults { "sdk_module-lib_current_framework-connectivity", ], static_libs: [ + "art-aconfig-flags-java-lib", "art-statslog-art-java", "artd-aidl-java", "dexopt_chroot_setup-aidl-java", @@ -128,7 +129,10 @@ java_sdk_library { "service-art-defaults", "framework-system-server-module-optimize-defaults", ], - permitted_packages: ["com.android.server.art"], + permitted_packages: [ + "com.android.art", + "com.android.server.art", + ], dex_preopt: { profile: "art-profile", }, @@ -144,6 +148,9 @@ java_sdk_library { optimize: { proguard_flags_files: ["proguard.flags"], }, + aconfig_declarations: [ + "art-aconfig-flags", + ], } java_library { |