diff options
| author | Roman Kiryanov <rkir@google.com> | 2024-03-22 04:31:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-22 04:31:59 +0000 |
| commit | c8e4a33d50818a27ae77ba6e1cfcfef832452637 (patch) | |
| tree | aa39aaa483154b6778f6aa437a5353ab595b5075 | |
| parent | bc1e905351e0c3e3f028373ba970a0b118083897 (diff) | |
| download | goldfish-c8e4a33d50818a27ae77ba6e1cfcfef832452637.tar.gz | |
Revert "Build emu64* 16K compatible by default"
This reverts commit bc1e905351e0c3e3f028373ba970a0b118083897.
Reason for revert: build break
Bug: 330813427
Change-Id: I5e02f9a3589ffb38114df8bc7835b67617b3f265
| -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, 7 insertions, 25 deletions
diff --git a/board/16k.mk b/board/16k.mk deleted file mode 100644 index 276d3ab0..00000000 --- a/board/16k.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# 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 f85e713a..9186a367 100644 --- a/board/emu64a/details.mk +++ b/board/emu64a/details.mk @@ -24,5 +24,3 @@ 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 a690da9a..0554dba7 100644 --- a/board/emu64a16k/details.mk +++ b/board/emu64a16k/details.mk @@ -25,4 +25,7 @@ PRODUCT_COPY_FILES += \ $(EMULATOR_KERNEL_FILE):kernel-ranchu \ device/generic/goldfish/data/etc/advancedFeatures.ini:advancedFeatures.ini \ -$(call inherit-product, device/generic/goldfish/board/16k.mk) + +# Enable large page size support +PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536 +PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true diff --git a/board/emu64x/details.mk b/board/emu64x/details.mk index 00718516..978cad4d 100644 --- a/board/emu64x/details.mk +++ b/board/emu64x/details.mk @@ -30,5 +30,3 @@ 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 d80838cc..745ef165 100644 --- a/board/emu64x16k/details.mk +++ b/board/emu64x16k/details.mk @@ -31,4 +31,6 @@ 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 \ -$(call inherit-product, device/generic/goldfish/board/16k.mk) +# Enable large page size support +PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536 +PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true |