summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Collingbourne <pcc@google.com>2022-02-02 11:28:48 -0800
committerPeter Collingbourne <pcc@google.com>2022-02-18 20:03:11 -0800
commiteccedd396113be155fccf7f53f73bd4e4f16c49b (patch)
treea25142e67ec50a0a7b32865c8f0215fdd72191b0
parentc0ad894bfadcce4be4778e1773aeb09f8f19ef47 (diff)
Remove pixel3_mainline target.
Unfortunately it has never worked particularly well due to missing driver support and it was getting in the way of some refactoring. The maintainers have indicated that they intend to continue maintaining it out of tree. Bug: 217455793 Change-Id: I2a659a980d32912bec5a1c0869c88e06a29cf9ce
-rw-r--r--Android.mk2
-rw-r--r--AndroidProducts.mk3
-rw-r--r--pixel3_mainline.mk27
-rw-r--r--pixel3_mainline/BoardConfig.mk23
-rw-r--r--pixel3_mainline/device.mk42
-rw-r--r--pixel3_mainline/fstab.pixel3_mainline8
6 files changed, 2 insertions, 103 deletions
diff --git a/Android.mk b/Android.mk
index ed787c7..4e30bfe 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,7 +20,7 @@
# to only building on ARM if they include assembly. Individual makefiles
# are responsible for having their own logic, for fine-grained control.
-ifneq ($(filter db845c pixel3_mainline rb5, $(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter db845c rb5, $(TARGET_BOARD_PLATFORM)),)
LOCAL_PATH := $(call my-dir)
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index e5d63dd..3982277 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -12,9 +12,8 @@
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/db845c.mk \
$(LOCAL_DIR)/rb5.mk \
- $(LOCAL_DIR)/pixel3_mainline.mk
COMMON_LUNCH_CHOICES := \
db845c-userdebug \
rb5-userdebug \
- pixel3_mainline-userdebug
+
diff --git a/pixel3_mainline.mk b/pixel3_mainline.mk
deleted file mode 100644
index 1b205c2..0000000
--- a/pixel3_mainline.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-PIXEL3_KERNEL_DIR := device/linaro/dragonboard-kernel/pixel3_mainline/
-
-# Inherit the full_base and device configurations
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, device/linaro/dragonboard/pixel3_mainline/device.mk)
-$(call inherit-product, device/linaro/dragonboard/device-common.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
-
-# Product overrides
-PRODUCT_NAME := pixel3_mainline
-PRODUCT_DEVICE := pixel3_mainline
-PRODUCT_BRAND := Android
-
-ifndef PIXEL3_USES_GKI
-PIXEL3_USES_GKI := true
-endif
-
-ifeq ($(PIXEL3_USES_GKI), true)
-PIXEL3_MODS := $(wildcard $(PIXEL3_KERNEL_DIR)/*.ko)
-ifneq ($(PIXEL3_MODS),)
- BOARD_VENDOR_KERNEL_MODULES += $(PIXEL3_MODS)
- P3_ONLY_VENDOR := %/msm.ko %/dwc3.ko %/dwc3-qcom.ko %/hci_uart.ko %/btqca.ko %/incrementalfs.ko
- P3_ONLY_VENDOR += %/ath10k_core.ko %/ath10k_pci.ko %/ath10k_snoc.ko %/ath.ko
-
- BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(filter-out $(P3_ONLY_VENDOR),$(PIXEL3_MODS))
-endif
-endif
diff --git a/pixel3_mainline/BoardConfig.mk b/pixel3_mainline/BoardConfig.mk
deleted file mode 100644
index 1ee5544..0000000
--- a/pixel3_mainline/BoardConfig.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-include device/linaro/dragonboard/BoardConfigCommon.mk
-
-# Board Information
-TARGET_BOOTLOADER_BOARD_NAME := pixel3_mainline
-TARGET_BOARD_PLATFORM := pixel3_mainline
-
-ifeq ($(PIXEL3_KERNEL_FOUND), true)
- # Bootloader/Kernel Configuration
- TARGET_NO_KERNEL := false
- BOARD_KERNEL_BAS := 0x00000000
- BOARD_KERNEL_PAGESIZE := 4096
- BOARD_KERNEL_TAGS_OFFSET := 0x01E00000
- BOARD_RAMDISK_OFFSET := 0x02000000
-endif
-
-# Image Configuration
-BOARD_BOOTIMAGE_PARTITION_SIZE := 0x04000000
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 10737418240
-BOARD_FLASH_BLOCK_SIZE := 131072
-# Super partition
-BOARD_SUPER_PARTITION_SIZE := 2952790016
-BOARD_DB_DYNAMIC_PARTITIONS_SIZE := 2948595712 # Reserve 4M for DAP metadata
-BOARD_SUPER_PARTITION_METADATA_DEVICE := system_b
diff --git a/pixel3_mainline/device.mk b/pixel3_mainline/device.mk
deleted file mode 100644
index f1af165..0000000
--- a/pixel3_mainline/device.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (C) 2011 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.
-#
-
-# copied from crosshatch
-# setup dalvik vm configs
-$(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk)
-
-PRODUCT_COPY_FILES := \
- device/linaro/dragonboard/pixel3_mainline/fstab.pixel3_mainline:$(TARGET_COPY_OUT_RAMDISK)/fstab.pixel3_mainline \
- device/linaro/dragonboard/pixel3_mainline/fstab.pixel3_mainline:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.pixel3_mainline \
- device/linaro/dragonboard/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.pixel3_mainline.rc \
- device/linaro/dragonboard/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.pixel3_mainline.usb.rc \
- device/linaro/dragonboard/common.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/pixel3_mainline.kl
-
-ifneq (,$(wildcard $(PIXEL3_KERNEL_DIR)/Image.gz-dtb))
- PRODUCT_COPY_FILES += $(PIXEL3_KERNEL_DIR)/Image.gz-dtb:kernel
- PIXEL3_KERNEL_FOUND := true
-else
- PIXEL3_KERNEL_FOUND := false
-endif
-
-# Build generic Audio HAL
-PRODUCT_PACKAGES := audio.primary.pixel3_mainline
-
-PRODUCT_PROPERTY_OVERRIDES += \
- ro.sf.lcd_density=443
-
-# Copy firmware files
-$(call inherit-product-if-exists, $(LOCAL_PATH)/firmware/device.mk)
diff --git a/pixel3_mainline/fstab.pixel3_mainline b/pixel3_mainline/fstab.pixel3_mainline
deleted file mode 100644
index 5d82515..0000000
--- a/pixel3_mainline/fstab.pixel3_mainline
+++ /dev/null
@@ -1,8 +0,0 @@
-system /system ext4 noatime,ro,errors=panic wait,logical,first_stage_mount
-/dev/block/platform/soc@0/1d84000.ufshc/by-name/userdata /data ext4 discard,noatime,noauto_da_alloc,data=ordered,user_xattr,barrier=1,inlinecrypt wait,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized,quota
-/dev/block/platform/soc@0/1d84000.ufshc/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,formattable
-#/dev/block/platform/soc@0/1d84000.ufshc/by-name/misc /misc emmc defaults defaults
-/devices/platform/soc@0/8804000.sdhci/mmc_host/mmc* auto auto defaults voldmanaged=sdcard1:auto
-vendor /vendor ext4 noatime,ro,errors=panic wait,logical,first_stage_mount
-system_ext /system_ext ext4 noatime,ro,errors=panic wait,logical,first_stage_mount
-product /product ext4 noatime,ro,errors=panic wait,logical,first_stage_mount