hi6250: switch to common base

Android.mk

@@ -5,7 +5,7 @@
 # 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
+#      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,

AndroidProducts.mk

@@ -5,7 +5,7 @@
 # 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
+#      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,
@@ -15,4 +15,4 @@
 #
 
 PRODUCT_MAKEFILES := \
-	$(LOCAL_DIR)/omni_hi6250.mk
+    $(LOCAL_DIR)/omni_hi6250.mk

BoardConfig.mk

@@ -5,7 +5,7 @@
 # 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
+#      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,
@@ -14,56 +14,13 @@
 # limitations under the License.
 #
 
-LOCAL_PATH := device/honor/berlin
+DEVICE_PATH := device/huawei/hi6250
 
-# Platform
-TARGET_BOARD_PLATFORM := hi6250
-
-# Bootloader
-TARGET_BOOTLOADER_BOARD_NAME := hi6250
-TARGET_NO_BOOTLOADER := true
-
-# Architecture
-TARGET_ARCH := arm64
-TARGET_ARCH_VARIANT := armv8-a
-TARGET_CPU_ABI := arm64-v8a
-TARGET_CPU_ABI2 :=
-TARGET_CPU_VARIANT := generic
-
-TARGET_2ND_ARCH := arm
-TARGET_2ND_ARCH_VARIANT := armv7-a-neon
-TARGET_2ND_CPU_ABI := armeabi-v7a
-TARGET_2ND_CPU_ABI2 := armeabi
-TARGET_2ND_CPU_VARIANT := cortex-a15
-
-TARGET_CPU_SMP := true
-ARCH_ARM_HAVE_TLS_REGISTER := true
-
-# Kernel
-BOARD_KERNEL_BASE := 0x00478000
-BOARD_KERNEL_PAGESIZE := 2048
-BOARD_KERNEL_CMDLINE := loglevel=4 coherent_pool=512K page_tracker=on slub_min_objects=12 androidboot.selinux=permissive
-BOARD_MKBOOTIMG_ARGS := --kernel_offset 0x00008000 --ramdisk_offset 0x07b88000 --tags_offset 0x07588000
-TARGET_PREBUILT_KERNEL := $(LOCAL_PATH)/kernel
+include device/hisi/6250-common/BoardConfigCommon.mk
 
 # Partitions
-TARGET_USERIMAGES_USE_EXT4 := true
-TARGET_USERIMAGES_USE_F2FS := true
 BOARD_BOOTIMAGE_PARTITION_SIZE := 33554432
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 67108864
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3758096384
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 25983713280
 BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456
-BOARD_FLASH_BLOCK_SIZE := 131072
-
-# TWRP
-RECOVERY_VARIANT := twrp
-TW_THEME := portrait_hdpi
-
-BOARD_SUPPRESS_SECURE_ERASE := true
-RECOVERY_SDCARD_ON_DATA := true
-RECOVERY_GRAPHICS_USE_LINELENGTH := true
-TARGET_RECOVERY_PIXEL_FORMAT := BGRA_8888
-TW_BRIGHTNESS_PATH := /sys/class/leds/lcd_backlight0/brightness
-TW_CUSTOM_BATTERY_PATH := /sys/class/power_supply/Battery
-TW_EXCLUDE_SUPERSU := true

omni_hi6250.mk

@@ -5,7 +5,7 @@
 # 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
+#      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,
@@ -14,36 +14,10 @@
 # limitations under the License.
 #
 
-## Specify phone tech before including full_phone
-$(call inherit-product, vendor/omni/config/gsm.mk)
-
-# Inherit from the common Open Source product configuration
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
-
-# Inherit some common Omni stuff.
-$(call inherit-product, vendor/omni/config/common.mk)
-
-PRODUCT_COPY_FILES += \
-    bionic/libc/zoneinfo/tzdata:root/system/usr/share/zoneinfo/tzdata
-
-PRODUCT_PACKAGES += \
-    charger_res_images \
-    charger
-
-ADDITIONAL_DEFAULT_PROPERTIES += \
-    ro.secure=0 \
-    ro.adb.secure=0 \
-    security.perf_harden=0 \
-    ro.allow.mock.location=1
-
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
-    sys.usb.configfs=1 \
-    sys.usb.config=mtp,adb \
-    persist.sys.usb.config=manufacture,adb \
-    sys.usb.controller=hisi-usb-otg
+# Include hi3650 common
+$(call inherit-product, device/hisi/6250-common/device-common.mk)
 
 PRODUCT_NAME := omni_hi6250
 PRODUCT_DEVICE := hi6250
 PRODUCT_BRAND := Huawei
 PRODUCT_MODEL := HUAWEI-P9-LITE
-PRODUCT_MANUFACTURER := HUAWEI