diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-03-21 23:32:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-21 23:32:19 +0000 |
| commit | 82e0fb5d20705f87311eec28d2f82ee291ed4bd1 (patch) | |
| tree | d57eef51c0ce628da6c93127198040254c8a4805 | |
| parent | f7ca6dd25a54c720d505b52caf21c80046c136b4 (diff) | |
| parent | bc1e905351e0c3e3f028373ba970a0b118083897 (diff) | |
| download | goldfish-82e0fb5d20705f87311eec28d2f82ee291ed4bd1.tar.gz | |
Merge "Build emu64* 16K compatible by default" into main
| -rw-r--r-- | board/16k.mk | 19 | ||||
| -rw-r--r-- | board/emu64a/details.mk | 2 | ||||
| -rw-r--r-- | board/emu64a16k/details.mk | 5 | ||||
| -rw-r--r-- | board/emu64x/details.mk | 2 | ||||
| -rw-r--r-- | board/emu64x16k/details.mk | 4 |
5 files changed, 25 insertions, 7 deletions
diff --git a/board/16k.mk b/board/16k.mk new file mode 100644 index 00000000..276d3ab0 --- /dev/null +++ b/board/16k.mk @@ -0,0 +1,19 @@ +# +# Copyright (C) 2024 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# Enable large page size support +PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536 +PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true diff --git a/board/emu64a/details.mk b/board/emu64a/details.mk index 9186a367..f85e713a 100644 --- a/board/emu64a/details.mk +++ b/board/emu64a/details.mk @@ -24,3 +24,5 @@ PRODUCT_COPY_FILES += \ device/generic/goldfish/board/fstab/arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu \ $(EMULATOR_KERNEL_FILE):kernel-ranchu \ device/generic/goldfish/data/etc/advancedFeatures.ini:advancedFeatures.ini \ + +$(call inherit-product, device/generic/goldfish/board/16k.mk) diff --git a/board/emu64a16k/details.mk b/board/emu64a16k/details.mk index 0554dba7..a690da9a 100644 --- a/board/emu64a16k/details.mk +++ b/board/emu64a16k/details.mk @@ -25,7 +25,4 @@ PRODUCT_COPY_FILES += \ $(EMULATOR_KERNEL_FILE):kernel-ranchu \ device/generic/goldfish/data/etc/advancedFeatures.ini:advancedFeatures.ini \ - -# Enable large page size support -PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536 -PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true +$(call inherit-product, device/generic/goldfish/board/16k.mk) diff --git a/board/emu64x/details.mk b/board/emu64x/details.mk index 978cad4d..00718516 100644 --- a/board/emu64x/details.mk +++ b/board/emu64x/details.mk @@ -30,3 +30,5 @@ PRODUCT_COPY_FILES += \ $(EMULATOR_KERNEL_FILE):kernel-ranchu \ device/generic/goldfish/board/fstab/x86:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.ranchu \ device/generic/goldfish/board/fstab/x86:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu \ + +$(call inherit-product, device/generic/goldfish/board/16k.mk) diff --git a/board/emu64x16k/details.mk b/board/emu64x16k/details.mk index 745ef165..d80838cc 100644 --- a/board/emu64x16k/details.mk +++ b/board/emu64x16k/details.mk @@ -31,6 +31,4 @@ PRODUCT_COPY_FILES += \ device/generic/goldfish/board/fstab/x86:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.ranchu \ device/generic/goldfish/board/fstab/x86:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu \ -# Enable large page size support -PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536 -PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true +$(call inherit-product, device/generic/goldfish/board/16k.mk) |