From f12ccd275e83422d318de3f95949497a58b3c83d Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Thu, 11 Apr 2024 12:36:34 -0700 Subject: [PATCH 1/2] 16kb: Remove the pg agnostic targets for 6.1 kernels Bug: 306537850 Test: Build targets manually Change-Id: I46f8d6872c67c8e8dc34684ea45f9b3c7a04d431 --- aosp_husky_61_pgagnostic.mk | 22 ---------------------- aosp_shiba_61_pgagnostic.mk | 22 ---------------------- 2 files changed, 44 deletions(-) delete mode 100644 aosp_husky_61_pgagnostic.mk delete mode 100644 aosp_shiba_61_pgagnostic.mk diff --git a/aosp_husky_61_pgagnostic.mk b/aosp_husky_61_pgagnostic.mk deleted file mode 100644 index 09c8e85..0000000 --- a/aosp_husky_61_pgagnostic.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright 2023 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. -# -$(call inherit-product, device/google/pixel_61/aosp_husky_61.mk) - -PRODUCT_NAME := aosp_husky_61_pgagnostic -PRODUCT_MODEL := AOSP page-size agnostic Husky 64K ELF - -PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true -PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536 diff --git a/aosp_shiba_61_pgagnostic.mk b/aosp_shiba_61_pgagnostic.mk deleted file mode 100644 index 79a5b29..0000000 --- a/aosp_shiba_61_pgagnostic.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright 2023 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. -# -$(call inherit-product, device/google/pixel_61/aosp_shiba_61.mk) - -PRODUCT_NAME := aosp_shiba_61_pgagnostic -PRODUCT_MODEL := AOSP page-size agnostic Shiba 64K ELF - -PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true -PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536 From 10c280819791026df9db220f46924b0cb2da92b1 Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Thu, 11 Apr 2024 18:02:31 -0700 Subject: [PATCH 2/2] 16kb: 16kb: Remove shusky pg agnostic Bug: 306537850 Test: N/A Change-Id: I972e4bf8c94798dd253a4bfb3ea68be854110f07 --- aosp_husky_61_pgagnostic.mk | 22 ---------------------- aosp_shiba_61_pgagnostic.mk | 22 ---------------------- 2 files changed, 44 deletions(-) delete mode 100644 aosp_husky_61_pgagnostic.mk delete mode 100644 aosp_shiba_61_pgagnostic.mk diff --git a/aosp_husky_61_pgagnostic.mk b/aosp_husky_61_pgagnostic.mk deleted file mode 100644 index 09c8e85..0000000 --- a/aosp_husky_61_pgagnostic.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright 2023 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. -# -$(call inherit-product, device/google/pixel_61/aosp_husky_61.mk) - -PRODUCT_NAME := aosp_husky_61_pgagnostic -PRODUCT_MODEL := AOSP page-size agnostic Husky 64K ELF - -PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true -PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536 diff --git a/aosp_shiba_61_pgagnostic.mk b/aosp_shiba_61_pgagnostic.mk deleted file mode 100644 index 79a5b29..0000000 --- a/aosp_shiba_61_pgagnostic.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright 2023 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. -# -$(call inherit-product, device/google/pixel_61/aosp_shiba_61.mk) - -PRODUCT_NAME := aosp_shiba_61_pgagnostic -PRODUCT_MODEL := AOSP page-size agnostic Shiba 64K ELF - -PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true -PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536