Преглед на файлове

build: Update to Android 12L

 * Change target inherits due to changes in Lineage vendor.
Alexander Koskovich преди 3 години
родител
ревизия
5c3ebab96e

+ 2 - 2
build/gapps.sh

@@ -8,8 +8,8 @@
 #
 DATE=$(date -u +%Y%m%d_%H%M%S)
 TOP=$(realpath .)
-ANDROIDV=12.0.0
-SDKV=31
+ANDROIDV=12.1.0
+SDKV=32
 GARCH=$1
 CPUARCH=$GARCH
 [ ! -z "$2" ] && CPUARCH=$2

+ 5 - 1
build/target/product/lineage_gapps_arm.mk

@@ -1,4 +1,8 @@
-include vendor/lineage/build/target/product/lineage_arm.mk
+$(call inherit-product, build/target/product/aosp_arm.mk)
+
+include vendor/lineage/build/target/product/lineage_generic_target.mk
+
+TARGET_NO_KERNEL_OVERRIDE := true
 
 PRODUCT_NAME := lineage_gapps_arm
 

+ 5 - 1
build/target/product/lineage_gapps_arm64.mk

@@ -1,4 +1,8 @@
-include vendor/lineage/build/target/product/lineage_arm64.mk
+$(call inherit-product, build/target/product/aosp_arm64.mk)
+
+include vendor/lineage/build/target/product/lineage_generic_target.mk
+
+TARGET_NO_KERNEL_OVERRIDE := true
 
 PRODUCT_NAME := lineage_gapps_arm64
 

+ 5 - 2
build/target/product/lineage_gapps_x86.mk

@@ -1,9 +1,12 @@
-include vendor/lineage/build/target/product/lineage_x86.mk
+$(call inherit-product, build/target/product/aosp_x86.mk)
 
-PRODUCT_NAME := lineage_gapps_x86
+include vendor/lineage/build/target/product/lineage_generic_target.mk
 
 PRODUCT_SDK_ADDON_NAME :=
 PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP :=
+
 TARGET_NO_KERNEL_OVERRIDE := true
 
+PRODUCT_NAME := lineage_gapps_x86
+
 PRODUCT_SOONG_NAMESPACES += vendor/gapps/overlay

+ 6 - 3
build/target/product/lineage_gapps_x86_64.mk

@@ -1,9 +1,12 @@
-include vendor/lineage/build/target/product/lineage_x86_64.mk
+$(call inherit-product, build/target/product/aosp_x86_64.mk)
 
-PRODUCT_NAME := lineage_gapps_x86_64
+include vendor/lineage/build/target/product/lineage_generic_target.mk
+
+TARGET_NO_KERNEL_OVERRIDE := true
 
 PRODUCT_SDK_ADDON_NAME :=
 PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP :=
-TARGET_NO_KERNEL_OVERRIDE := true
+
+PRODUCT_NAME := lineage_gapps_x86_64
 
 PRODUCT_SOONG_NAMESPACES += vendor/gapps/overlay