Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 675d4688 authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Revert^2 "Auto generate prebuilt_* modules from PRODUCT_COPY_FILES"

This change generates the prebuilt_* modules from PRODUCT_COPY_FILES and
add the generated modules as deps of the (also) auto generated
filesystem modules.

The modules generation takes 3 factors into consideration:
- source file path
- install partition
- relative install path from the partition root

For example, for PRODUCT_COPY_FILES entries that look like below:
```
foo/bar/baz.ogg:$(TARGET_OUT_PRODUCT)/media/audio/baaz.ogg
foo/bar/bar.txt:$(TARGET_OUT)/bar.txt
foo/bar.xml:$(TARGET_OUT_VENDOR)/etc/init/bar.xml
```

Three distinct modules would be generated, that look like the
followings:
```
foo/bar/Android.bp:

prebuilt_media_audio {
    name: "product-foo_bar-media_audio-ogg",
    product_specific: true,
    srcs: [
        "baz.ogg",
    ],
    dsts: [
        "baaz.ogg",
    ],
}

prebuilt_root {
    name: "system-foo_bar-bar-txt",
    srcs: [
        "bar.txt",
    ],
}

foo/Android.bp:

prebuilt_etc {
    name: "vendor-foo-etc_init-xml",
    relative_install_path: "init",
    srcs: [
        "bar.xml",
    ],
}
```

This change also remove some hardcoded deps entries from
`FsGenState.fsDeps`, as they are replaced with the auto generated
prebuilt_* modules.

Test: m nothing && m soong_generated_product_filesystem_test
Bug: 375053752
Change-Id: Id9daa9d248a0187185e86ab33484d6140ee228a1
parent 2e2b7441
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment