diff options
| author | 2024-01-23 23:30:42 +0000 | |
|---|---|---|
| committer | 2024-01-23 23:30:42 +0000 | |
| commit | 85e169c3358b215f7cb50b05d21702964ab4247f (patch) | |
| tree | e4b8400c411e2ea4c2160142a1eb2d2927293bb5 | |
| parent | 4453934e28d94a2c8e2597f18284dd59833d0955 (diff) | |
| parent | c537cba76b99f2ae7fdd41d8a855935792256619 (diff) | |
Merge "Add aconfig declarations to f/b droidstubs" into main
| -rw-r--r-- | AconfigFlags.bp | 20 | ||||
| -rw-r--r-- | api/Android.bp | 1 |
2 files changed, 21 insertions, 0 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp index bd693850f45e..59a1cbc38216 100644 --- a/AconfigFlags.bp +++ b/AconfigFlags.bp @@ -18,6 +18,7 @@ aconfig_srcjars = [ ":android.content.pm.flags-aconfig-java{.generated_srcjars}", ":android.content.res.flags-aconfig-java{.generated_srcjars}", ":android.hardware.biometrics.flags-aconfig-java{.generated_srcjars}", + ":android.media.playback.flags-aconfig-java{.generated_srcjars}", ":android.net.vcn.flags-aconfig-java{.generated_srcjars}", ":android.nfc.flags-aconfig-java{.generated_srcjars}", ":android.os.flags-aconfig-java{.generated_srcjars}", @@ -30,6 +31,25 @@ aconfig_srcjars = [ // !!! KEEP THIS LIST ALPHABETICAL !!! ] +stubs_defaults { + name: "framework-minus-apex-aconfig-declarations", + aconfig_declarations: [ + "android.content.pm.flags-aconfig", + "android.content.res.flags-aconfig", + "android.hardware.biometrics.flags-aconfig", + "android.media.playback.flags-aconfig", + "android.net.vcn.flags-aconfig", + "android.nfc.flags-aconfig", + "android.os.flags-aconfig", + "android.security.flags-aconfig", + "com.android.hardware.camera2-aconfig", + "com.android.hardware.input.input-aconfig", + "com.android.window.flags.window-aconfig", + "com.android.text.flags-aconfig", + "com.android.net.flags-aconfig", + ], +} + filegroup { name: "framework-minus-apex-aconfig-srcjars", srcs: aconfig_srcjars, diff --git a/api/Android.bp b/api/Android.bp index 7dd13e3f8a09..7fb427eb715a 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -310,6 +310,7 @@ packages_to_document = [ // classpath (or sources) somehow. stubs_defaults { name: "android-non-updatable-stubs-defaults", + defaults: ["framework-minus-apex-aconfig-declarations"], srcs: [":android-non-updatable-stub-sources"], sdk_version: "none", system_modules: "none", |