diff options
| author | Matthias Maennich <maennich@google.com> | 2020-03-26 14:09:24 +0100 |
|---|---|---|
| committer | Matthias Maennich <maennich@google.com> | 2020-03-26 14:09:24 +0100 |
| commit | 75a546fd6ce5d43b3fa169cd172c9d57b0b23fb5 (patch) | |
| tree | 6d2c2141cbe9618bfa8104343c5861f7f3936f82 | |
| parent | 7cae5d292835cbd150d85936a388e89b5d77184e (diff) | |
| download | goldfish-modules-75a546fd6ce5d43b3fa169cd172c9d57b0b23fb5.tar.gz | |
build.config.goldfish*: do not reuse the full GKI config
Using the *full* GKI config introduces ABI monitoring and whitelist
functionality. This is not supposed to be done for goldfish.
Hence, fix and refactor the config to only reuse the common parts that
are meant to be reused.
Bug: 152485743
Signed-off-by: Matthias Maennich <maennich@google.com>
Change-Id: Ib1032777f92c75b111954bbb32b571358a6e9e22
| -rw-r--r-- | build.config.goldfish | 4 | ||||
| -rw-r--r-- | build.config.goldfish.aarch64 | 2 | ||||
| -rw-r--r-- | build.config.goldfish.x86_64 | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/build.config.goldfish b/build.config.goldfish index f143091..3f961ba 100644 --- a/build.config.goldfish +++ b/build.config.goldfish @@ -1,3 +1,5 @@ +. ${ROOT_DIR}/common/build.config.common +. ${ROOT_DIR}/common/build.config.gki + EXT_MODULES="goldfish-modules" FRAGMENT_DEFCONFIG_PATH="${ROOT_DIR}/goldfish-modules/goldfish_defconfig.fragment" -TRIM_NONLISTED_KMI="" diff --git a/build.config.goldfish.aarch64 b/build.config.goldfish.aarch64 index 9f0fb8d..7c4def9 100644 --- a/build.config.goldfish.aarch64 +++ b/build.config.goldfish.aarch64 @@ -1,5 +1,5 @@ -. ${ROOT_DIR}/common/build.config.gki.aarch64 . ${ROOT_DIR}/goldfish-modules/build.config.goldfish +. ${ROOT_DIR}/common/build.config.aarch64 DEFCONFIG=goldfish_aarch64_defconfig DEFCONFIG_PATH="${ROOT_DIR}/common/arch/arm64/configs" diff --git a/build.config.goldfish.x86_64 b/build.config.goldfish.x86_64 index 7f0362f..7564b73 100644 --- a/build.config.goldfish.x86_64 +++ b/build.config.goldfish.x86_64 @@ -1,5 +1,5 @@ -. ${ROOT_DIR}/common/build.config.gki.x86_64 . ${ROOT_DIR}/goldfish-modules/build.config.goldfish +. ${ROOT_DIR}/common/build.config.x86_64 DEFCONFIG=goldfish_86_64_defconfig DEFCONFIG_PATH="${ROOT_DIR}/common/arch/x86/configs" |