diff options
author | Inseob Kim <inseob@google.com> | 2024-05-07 14:34:42 +0900 |
---|---|---|
committer | Inseob Kim <inseob@google.com> | 2024-05-07 14:34:42 +0900 |
commit | 8541b878803050de6ec921cb9f3d6e8c6c15f1f6 (patch) | |
tree | cc5d57b1fca64b304d66d47b8f7422e621f26593 | |
parent | f4d84e1a293402e054afde5a1d8efbc8236f51ea (diff) | |
download | base-8541b878803050de6ec921cb9f3d6e8c6c15f1f6.tar.gz |
Use no_full_install: true instead of installable: false
So far, we have used `instalable: false` to avoid collision with the
other modules that are installed to the same path. A typical example was
<foo> and <foo>.microdroid. The latter is a modified version of the
former for the inclusion of the microdroid image. They however both have
the same instalation path (ex: system/bin) and stem (ex: foo) so that we
can reference them using the same path regardless of whether we are in
Android or microdroid.
However, the use of `installable: false` for the purpose is actually
incorrect, because `installable: false` also means, obviously, "this
module shouldn't be installed". The only reason this incorrect way has
worked is simply because packaging modules (ex: android_filesystem)
didn't respect the property when gathering the modules.
As packaging modules are now fixed to respect `installable: false`, we
need a correct way of avoiding the collision. `no_full_install: true` is
it.
If a module has this property set to true, it is never installed to the
full instal path like out/target/product/<partition>/... It can be
installed only via packaging modules.
Bug: 335369205
Bug: 337993945
Test: m droid aosp_cf_system_x86_64
Change-Id: If9c053968bde39c3eb3b852f1df1d475161bd846
-rw-r--r-- | config/Android.bp | 2 | ||||
-rw-r--r-- | data/keyboards/Android.bp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config/Android.bp b/config/Android.bp index adce203e1140..c9948c31f1c3 100644 --- a/config/Android.bp +++ b/config/Android.bp @@ -33,7 +33,7 @@ prebuilt_etc { name: "preloaded-classes", src: "preloaded-classes", filename: "preloaded-classes", - installable: false, + no_full_install: true, } filegroup { diff --git a/data/keyboards/Android.bp b/data/keyboards/Android.bp index e62678f92d8b..423b55bd85db 100644 --- a/data/keyboards/Android.bp +++ b/data/keyboards/Android.bp @@ -33,7 +33,7 @@ prebuilt_usr_keylayout { srcs: [ "*.kl", ], - installable: false, + no_full_install: true, } prebuilt_usr_keychars { @@ -41,7 +41,7 @@ prebuilt_usr_keychars { srcs: [ "*.kcm", ], - installable: false, + no_full_install: true, } prebuilt_usr_idc { @@ -49,5 +49,5 @@ prebuilt_usr_idc { srcs: [ "*.idc", ], - installable: false, + no_full_install: true, } |