diff options
| author | Oriol Prieto Gasco <opg@google.com> | 2024-02-03 02:38:37 +0000 |
|---|---|---|
| committer | Oriol Prieto Gasco <opg@google.com> | 2024-02-03 02:38:37 +0000 |
| commit | e9a6bd5d3ef531f32c9ae227daa3f3359f0bf7af (patch) | |
| tree | 9b372b4eba42dc33e42611aeb30a1d44d687b783 | |
| parent | f148c99aed82a0ff0e92a9b6dc057b3fd547979b (diff) | |
| download | development-e9a6bd5d3ef531f32c9ae227daa3f3359f0bf7af.tar.gz | |
Set the container field of aconfig flags
Test: m
Bug: 312769710
Change-Id: Ib1a18d41ad51ccc50eead4bfa979912995454c11
| -rw-r--r-- | samples/AconfigDemo/Android.bp | 8 | ||||
| -rw-r--r-- | samples/AconfigDemo/aconfig_demo_flags.aconfig | 1 | ||||
| -rw-r--r-- | samples/AconfigDemo/internal/Android.bp | 1 | ||||
| -rw-r--r-- | samples/AconfigDemo/internal/trunk_stable_workflow_test.aconfig | 1 |
4 files changed, 7 insertions, 4 deletions
diff --git a/samples/AconfigDemo/Android.bp b/samples/AconfigDemo/Android.bp index 7ce4e0172..628fe5b0e 100644 --- a/samples/AconfigDemo/Android.bp +++ b/samples/AconfigDemo/Android.bp @@ -6,7 +6,7 @@ android_app { name: "AconfigDemoActivity", manifest: "AndroidManifest.xml", srcs: [ - "src/**/*.java" + "src/**/*.java", ], platform_apis: true, certificate: "platform", @@ -28,6 +28,7 @@ android_app { aconfig_declarations { name: "aconfig_demo_flags", package: "com.example.android.aconfig.demo.flags", + container: "system", srcs: ["aconfig_demo_flags.aconfig"], } @@ -60,7 +61,6 @@ java_library { ], } - cc_aconfig_library { name: "aconfig_demo_flags_c_lib", aconfig_declarations: "aconfig_demo_flags", @@ -77,7 +77,7 @@ cc_library { "-Wno-unused-parameter", ], header_libs: [ - "jni_headers", + "jni_headers", ], shared_libs: [ "server_configurable_flags", @@ -101,7 +101,7 @@ rust_ffi_shared { rustlibs: [ "libjni", "libaconfig_demo_flags_rust", - ] + ], } // Test setup diff --git a/samples/AconfigDemo/aconfig_demo_flags.aconfig b/samples/AconfigDemo/aconfig_demo_flags.aconfig index 2b685727b..80f4f6eac 100644 --- a/samples/AconfigDemo/aconfig_demo_flags.aconfig +++ b/samples/AconfigDemo/aconfig_demo_flags.aconfig @@ -1,4 +1,5 @@ package: "com.example.android.aconfig.demo.flags" +container: "system" flag { name: "append_injected_content" diff --git a/samples/AconfigDemo/internal/Android.bp b/samples/AconfigDemo/internal/Android.bp index 49e7b75d8..a59cdfe75 100644 --- a/samples/AconfigDemo/internal/Android.bp +++ b/samples/AconfigDemo/internal/Android.bp @@ -5,5 +5,6 @@ package { aconfig_declarations { name: "trunk_stable_workflow_testing", package: "com.android.trunk_stable_workflow_testing", + container: "system", srcs: ["trunk_stable_workflow_test.aconfig"], } diff --git a/samples/AconfigDemo/internal/trunk_stable_workflow_test.aconfig b/samples/AconfigDemo/internal/trunk_stable_workflow_test.aconfig index bba9f76dc..ecab3cc22 100644 --- a/samples/AconfigDemo/internal/trunk_stable_workflow_test.aconfig +++ b/samples/AconfigDemo/internal/trunk_stable_workflow_test.aconfig @@ -1,4 +1,5 @@ package: "com.android.trunk_stable_workflow_testing" +container: "system" flag { name: "welcome_aboard" |