diff options
| author | Handa Wang <handaw@google.com> | 2023-11-03 13:53:34 +0800 |
|---|---|---|
| committer | Handa Wang <handaw@google.com> | 2023-11-03 07:49:11 +0000 |
| commit | 6266d5d9ed641265db7bc6282870ba26f6595220 (patch) | |
| tree | d211b72b675e87fb97455cc13ddf369470f82cbf | |
| parent | 77eb7949aaa8ad0868ef9c6f10caf7ba2e0f992b (diff) | |
| download | openthread-6266d5d9ed641265db7bc6282870ba26f6595220.tar.gz | |
let ot-cli-ftd use RAM-based `otSettings`
In this way `ot-cli-ftd` won't read/write any regular file so it's more friendly to shell in terms of SELinux policies.
This CL also removes the `vendor` mark of `ot-cli-ftd` because we're moving the binary to `/system/bin`.
Bug: 309051262
Test: Verified on Cuttlefish.
Change-Id: Iae5a15e664109077972458f024c1387daa7c5231
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | src/android/ot-cli-ftd.rc | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp index c5d672f92..47695073f 100644 --- a/Android.bp +++ b/Android.bp @@ -397,6 +397,7 @@ filegroup { "examples/platforms/simulation/uart.c", "examples/platforms/utils/link_metrics.cpp", "examples/platforms/utils/mac_frame.cpp", + "examples/platforms/utils/settings_ram.c", "examples/platforms/utils/soft_source_match_table.c", ], } @@ -660,9 +661,11 @@ cc_defaults { "-DOPENTHREAD_CONFIG_MLR_ENABLE=1", "-DOPENTHREAD_CONFIG_NCP_HDLC_ENABLE=1", "-DOPENTHREAD_CONFIG_PING_SENDER_ENABLE=1", + "-DOPENTHREAD_CONFIG_PLATFORM_FLASH_API_ENABLE=0", "-DOPENTHREAD_EXAMPLES_SIMULATION=1", "-DOPENTHREAD_CONFIG_TCP_ENABLE=0", "-DOPENTHREAD_PROJECT_CORE_CONFIG_FILE=\"examples/platforms/simulation/openthread-core-simulation-config.h\"", + "-DOPENTHREAD_SETTINGS_RAM=1", "-DPACKAGE=\"openthread\"", "-DPACKAGE_BUGREPORT=\"openthread-devel@googlegroups.com\"", "-DPACKAGE_NAME=\"OPENTHREAD\"", @@ -994,7 +997,4 @@ cc_binary { shared_libs: [ "libcutils", // Required by src/core/instance_api.cpp ], - - init_rc: ["src/android/ot-cli-ftd.rc"], - vendor: true, } diff --git a/src/android/ot-cli-ftd.rc b/src/android/ot-cli-ftd.rc deleted file mode 100644 index 57d2d299d..000000000 --- a/src/android/ot-cli-ftd.rc +++ /dev/null @@ -1,4 +0,0 @@ -# The settings data directory for simulation `ot-cli-ftd` program -on post-fs-data - mkdir /data/vendor/threadnetwork 0770 root root - mkdir /data/vendor/threadnetwork/simulation 0770 root root |