diff options
| author | Kalesh Singh <kaleshsingh@google.com> | 2024-03-26 18:11:18 +0000 |
|---|---|---|
| committer | Kalesh Singh <kaleshsingh@google.com> | 2024-03-26 11:29:51 -0700 |
| commit | aa422ebeb93dfe45c16f3df37bda7996b3653eb6 (patch) | |
| tree | cf852e06e6e62e08d884aaf6420b58b8aded0b41 | |
| parent | 4adefe66bd113b4cf0b5793bdee1b43fd5ff221b (diff) | |
| download | goldfish-aa422ebeb93dfe45c16f3df37bda7996b3653eb6.tar.gz | |
Revert^2 "Build emu64* 16K compatible by default"
This reverts commit c8e4a33d50818a27ae77ba6e1cfcfef832452637.
Reason for revert: Art build error is now fixed
Bug: 328138888
Test: lunch sdk_phone64_x86_64-trunk_staging-userdebug
Test: get_build_var TARGET_MAX_PAGE_SIZE_SUPPORTED
Test: get_build_var TARGET_NO_BIONIC_PAGE_SIZE_MACRO
Change-Id: Ia2f7dd9124f86e9b147745f4f3fda5b06b2483b3
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
| -rw-r--r-- | board/16k.mk | 19 | ||||
| -rw-r--r-- | board/emu64a/details.mk | 2 | ||||
| -rw-r--r-- | board/emu64a16k/details.mk | 2 | ||||
| -rw-r--r-- | board/emu64x/details.mk | 2 | ||||
| -rw-r--r-- | board/emu64x16k/details.mk | 2 |
5 files changed, 25 insertions, 2 deletions
diff --git a/board/16k.mk b/board/16k.mk new file mode 100644 index 00000000..c41802ab --- /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 := 16384 +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 6afe4bfd..a690da9a 100644 --- a/board/emu64a16k/details.mk +++ b/board/emu64a16k/details.mk @@ -25,4 +25,4 @@ PRODUCT_COPY_FILES += \ $(EMULATOR_KERNEL_FILE):kernel-ranchu \ device/generic/goldfish/data/etc/advancedFeatures.ini:advancedFeatures.ini \ -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 9f441cf8..d80838cc 100644 --- a/board/emu64x16k/details.mk +++ b/board/emu64x16k/details.mk @@ -31,4 +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 \ -PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true +$(call inherit-product, device/generic/goldfish/board/16k.mk) |