From b138b74ed4b6f042e5a0bc06e965a73676fb16eb Mon Sep 17 00:00:00 2001
From: Juan Yescas <jyescas@google.com>
Date: Tue, 17 Oct 2023 17:20:09 -0700
Subject: [PATCH] 16k: Update aosp shusky target names to indicate 6.1 kernel
 is used

Update the shusky target names to indicate the page agnostic
targets will use 6.1 kernel with 16k page size support.

Bug: 302592613
Bug: 301596209

Test: source build/envsetup.sh
      lunch aosp_husky_61_pgagnostic
      m
Change-Id: I29a5c933a5b8097cd3b26b3f1b820b234c94df53
---
 AndroidProducts.mk                                      | 4 ++--
 aosp_husky_pgagnostic.mk => aosp_husky_61_pgagnostic.mk | 4 ++--
 aosp_shiba_pgagnostic.mk => aosp_shiba_61_pgagnostic.mk | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename aosp_husky_pgagnostic.mk => aosp_husky_61_pgagnostic.mk (87%)
 rename aosp_shiba_pgagnostic.mk => aosp_shiba_61_pgagnostic.mk (87%)

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 4e79d41..ab79cc6 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -19,12 +19,12 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_ripcurrent_fullmte.mk \
     $(LOCAL_DIR)/factory_ripcurrent.mk \
     $(LOCAL_DIR)/aosp_husky.mk \
+    $(LOCAL_DIR)/aosp_husky_61_pgagnostic.mk \
     $(LOCAL_DIR)/aosp_husky_fullmte.mk \
-    $(LOCAL_DIR)/aosp_husky_pgagnostic.mk \
     $(LOCAL_DIR)/factory_husky.mk \
     $(LOCAL_DIR)/aosp_shiba.mk \
+    $(LOCAL_DIR)/aosp_shiba_61_pgagnostic.mk \
     $(LOCAL_DIR)/aosp_shiba_fullmte.mk \
-    $(LOCAL_DIR)/aosp_shiba_pgagnostic.mk \
     $(LOCAL_DIR)/factory_shiba.mk
 
 COMMON_LUNCH_CHOICES := \
diff --git a/aosp_husky_pgagnostic.mk b/aosp_husky_61_pgagnostic.mk
similarity index 87%
rename from aosp_husky_pgagnostic.mk
rename to aosp_husky_61_pgagnostic.mk
index 81219c7..5687be9 100644
--- a/aosp_husky_pgagnostic.mk
+++ b/aosp_husky_61_pgagnostic.mk
@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-$(call inherit-product, device/google/shusky/aosp_husky.mk)
+$(call inherit-product, device/google/pixel_61/aosp_husky_61.mk)
 
-PRODUCT_NAME := aosp_husky_pgagnostic
+PRODUCT_NAME := aosp_husky_61_pgagnostic
 PRODUCT_MODEL := AOSP page-size agnostic Husky 64K ELF
 
 PRODUCT_PAGE_SIZE_AGNOSTIC := true
diff --git a/aosp_shiba_pgagnostic.mk b/aosp_shiba_61_pgagnostic.mk
similarity index 87%
rename from aosp_shiba_pgagnostic.mk
rename to aosp_shiba_61_pgagnostic.mk
index 390d07c..adf61d0 100644
--- a/aosp_shiba_pgagnostic.mk
+++ b/aosp_shiba_61_pgagnostic.mk
@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-$(call inherit-product, device/google/shusky/aosp_shiba.mk)
+$(call inherit-product, device/google/pixel_61/aosp_shiba_61.mk)
 
-PRODUCT_NAME := aosp_shiba_pgagnostic
+PRODUCT_NAME := aosp_shiba_61_pgagnostic
 PRODUCT_MODEL := AOSP page-size agnostic Shiba 64K ELF
 
 PRODUCT_PAGE_SIZE_AGNOSTIC := true