openkylin
/
device_google_cuttlefish
mirror of https://gitee.com/openkylin/device_google_cuttlefish.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Revert "Move cuttlefish to 5.10 kernel (GKI 2.0)""

This commit is contained in:
Treehugger Robot 2020-12-23 02:54:46 +00:00 committed by Gerrit Code Review
parent fbc5f87310 6c9ba21abe
commit a9bbd55b82
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shared/BoardConfig.mk
View File

@ -212,4 +212,4 @@ else
BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT := true BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT := true
endif endif
BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT := true BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT := true
BOARD_KERNEL_MODULE_INTERFACE_VERSIONS := 5.10-android12-0 BOARD_KERNEL_MODULE_INTERFACE_VERSIONS := 5.4-android12-0

2
shared/device.mk
View File

@ -509,7 +509,7 @@ PRODUCT_PACKAGES += \
android.hardware.memtrack-service.example android.hardware.memtrack-service.example
# GKI APEX # GKI APEX
PRODUCT_PACKAGES += com.android.gki.kmi_5_10_android12_0 PRODUCT_PACKAGES += com.android.gki.kmi_5_4_android12_0
# WLAN driver configuration files # WLAN driver configuration files
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \

2
vsoc_arm64/BoardConfig.mk
View File

@ -33,7 +33,7 @@ TARGET_2ND_CPU_VARIANT := cortex-a53
TARGET_TRANSLATE_2ND_ARCH := false TARGET_TRANSLATE_2ND_ARCH := false
ifeq ($(BOARD_VENDOR_RAMDISK_KERNEL_MODULES),) ifeq ($(BOARD_VENDOR_RAMDISK_KERNEL_MODULES),)
BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(wildcard device/google/cuttlefish_prebuilts/kernel/5.10-arm64/*.ko) BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(wildcard device/google/cuttlefish_prebuilts/kernel/5.4-arm64/*.ko)
endif endif
HOST_CROSS_OS := linux_bionic HOST_CROSS_OS := linux_bionic

2
vsoc_arm64/kernel.mk
View File

@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
PRODUCT_COPY_FILES += kernel/prebuilts/5.10/arm64/kernel-5.10:kernel PRODUCT_COPY_FILES += kernel/prebuilts/5.4/arm64/kernel-5.4:kernel

2
vsoc_arm64_only/BoardConfig.mk
View File

@ -27,7 +27,7 @@ TARGET_CPU_ABI := arm64-v8a
TARGET_CPU_VARIANT := cortex-a53 TARGET_CPU_VARIANT := cortex-a53
AUDIOSERVER_MULTILIB := first AUDIOSERVER_MULTILIB := first
BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(wildcard device/google/cuttlefish_prebuilts/kernel/5.10-arm64/*.ko) BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(wildcard device/google/cuttlefish_prebuilts/kernel/5.4-arm64/*.ko)
HOST_CROSS_OS := linux_bionic HOST_CROSS_OS := linux_bionic
HOST_CROSS_ARCH := arm64 HOST_CROSS_ARCH := arm64

2
vsoc_x86/BoardConfig.mk
View File

@ -33,7 +33,7 @@ TARGET_NATIVE_BRIDGE_ABI := armeabi-v7a armeabi
BUILD_BROKEN_DUP_RULES := true BUILD_BROKEN_DUP_RULES := true
ifeq ($(BOARD_VENDOR_RAMDISK_KERNEL_MODULES),) ifeq ($(BOARD_VENDOR_RAMDISK_KERNEL_MODULES),)
BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(wildcard device/google/cuttlefish_prebuilts/kernel/5.10-x86_64/*.ko) BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(wildcard device/google/cuttlefish_prebuilts/kernel/5.4-x86_64/*.ko)
endif endif
# TODO(b/156534160): Temporarily allow for the old style PRODUCT_COPY_FILES for ndk_translation_prebuilt # TODO(b/156534160): Temporarily allow for the old style PRODUCT_COPY_FILES for ndk_translation_prebuilt

2
vsoc_x86_64/BoardConfig.mk
View File

@ -43,5 +43,5 @@ TARGET_NATIVE_BRIDGE_2ND_ABI := armeabi-v7a armeabi
BUILD_BROKEN_DUP_RULES := true BUILD_BROKEN_DUP_RULES := true
ifeq ($(BOARD_VENDOR_RAMDISK_KERNEL_MODULES),) ifeq ($(BOARD_VENDOR_RAMDISK_KERNEL_MODULES),)
BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(wildcard device/google/cuttlefish_prebuilts/kernel/5.10-x86_64/*.ko) BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(wildcard device/google/cuttlefish_prebuilts/kernel/5.4-x86_64/*.ko)
endif endif

2
vsoc_x86_64/kernel.mk
View File

@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
PRODUCT_COPY_FILES += kernel/prebuilts/5.10/x86_64/kernel-5.10:kernel PRODUCT_COPY_FILES += kernel/prebuilts/5.4/x86_64/kernel-5.4:kernel

2
vsoc_x86_64_only/BoardConfig.mk
View File

@ -32,4 +32,4 @@ TARGET_NATIVE_BRIDGE_ABI := arm64-v8a
AUDIOSERVER_MULTILIB := first AUDIOSERVER_MULTILIB := first
BUILD_BROKEN_DUP_RULES := true BUILD_BROKEN_DUP_RULES := true
BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(wildcard device/google/cuttlefish_prebuilts/kernel/5.10-x86_64/*.ko) BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(wildcard device/google/cuttlefish_prebuilts/kernel/5.4-x86_64/*.ko)

2
vsoc_x86_only/BoardConfig.mk
View File

@ -25,4 +25,4 @@ TARGET_ARCH := x86
TARGET_ARCH_VARIANT := x86 TARGET_ARCH_VARIANT := x86
TARGET_CPU_ABI := x86 TARGET_CPU_ABI := x86
BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(wildcard device/google/cuttlefish_prebuilts/kernel/5.10-i686/*.ko) BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(wildcard device/google/cuttlefish_prebuilts/kernel/5.4-i686/*.ko)

2
vsoc_x86_only/kernel.mk
View File

@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
PRODUCT_COPY_FILES += device/google/cuttlefish_prebuilts/kernel/5.10-i686/kernel-5.10:kernel PRODUCT_COPY_FILES += device/google/cuttlefish_prebuilts/kernel/5.4-i686/kernel-5.4:kernel