From 2b7be886c824c80aba8ffc29ab97b5f1fbd07570 Mon Sep 17 00:00:00 2001 From: Thierry Strudel Date: Sat, 4 Mar 2017 13:02:35 -0800 Subject: [PATCH] taimen: derive product from device/google/wahoo Test: boot, basic functionality Change-Id: I983773ad19721997998bfe45c5b19a741bf8290f Signed-off-by: Thierry Strudel --- Android.mk | 19 -------- BoardConfig.mk | 3 +- android_filesystem_config.h | 40 ---------------- aosp_taimen.mk | 2 - board-info.txt | 1 + device.mk | 11 ++--- fstab.hardware | 10 ++++ system.prop | 96 ------------------------------------- 8 files changed, 17 insertions(+), 165 deletions(-) delete mode 100644 Android.mk delete mode 100644 android_filesystem_config.h create mode 100644 board-info.txt create mode 100644 fstab.hardware delete mode 100644 system.prop diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 7e4418d..0000000 --- a/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright 2017 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. -# - -ifneq ($(filter taimen, $(TARGET_DEVICE)),) - include $(call first-makefiles-under, device/qcom/msmcobalt) -endif diff --git a/BoardConfig.mk b/BoardConfig.mk index 90e16c9..7006704 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -17,6 +17,5 @@ TARGET_BOOTLOADER_BOARD_NAME := taimen DEFAULT_LOW_PERSISTENCE_MODE_BRIGHTNESS := 0x00000056 -include device/qcom/msmcobalt/CommonBoardConfig.mk - +include device/google/wahoo/BoardConfig.mk -include vendor/google_devices/taimen/BoardConfigVendor.mk diff --git a/android_filesystem_config.h b/android_filesystem_config.h deleted file mode 100644 index 2033b7e..0000000 --- a/android_filesystem_config.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2017 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. - */ - -/* This file is used to define the properties of the filesystem -** images generated by build tools (mkbootfs and mkyaffs2image) and -** by the device side of adb. -*/ - -#include - -static const struct fs_path_config android_device_dirs[] = { - { 00771, AID_SYSTEM, AID_SYSTEM, 0, "bt_firmware"}, -}; - -/* Rules for files. -** These rules are applied based on "first match", so they -** should start with the most specific path and work their -** way up to the root. Prefixes ending in * denotes wildcard -** and will allow partial matches. -*/ -static const struct fs_path_config android_device_files[] = { - { 00755, AID_SYSTEM, AID_SYSTEM, (1ULL << CAP_NET_BIND_SERVICE), "vendor/bin/pm-service" }, - { 00755, AID_SYSTEM, AID_SYSTEM, (1ULL << CAP_NET_BIND_SERVICE), "vendor/bin/cnss-daemon"}, -#ifdef NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS - { 00000, AID_ROOT, AID_ROOT, 0, "system/etc/fs_config_dirs" }, -#endif -}; diff --git a/aosp_taimen.mk b/aosp_taimen.mk index 1b9d7c5..abf0e00 100644 --- a/aosp_taimen.mk +++ b/aosp_taimen.mk @@ -29,9 +29,7 @@ PRODUCT_MODEL := AOSP on taimen PRODUCT_MANUFACTURER := Google PRODUCT_RESTRICT_VENDOR_FILES := all -$(call inherit-product, device/qcom/msmcobalt/utils.mk) $(call inherit-product, device/google/taimen/device.mk) -$(call inherit-product-if-exists, vendor/qcom/msmcobalt/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/taimen/device-vendor.mk) PRODUCT_PACKAGES += \ diff --git a/board-info.txt b/board-info.txt new file mode 100644 index 0000000..71f0186 --- /dev/null +++ b/board-info.txt @@ -0,0 +1 @@ +require board=taimen diff --git a/device.mk b/device.mk index ae36023..5c61d09 100644 --- a/device.mk +++ b/device.mk @@ -21,8 +21,11 @@ PRODUCT_AAPT_PREBUILT_DPI := xxxhdpi xxhdpi xhdpi hdpi PRODUCT_HARDWARE := taimen TARGET_PREBUILT_KERNEL := device/google/taimen-kernel/Image.gz-dtb -include device/qcom/msmcobalt/device-common.mk -BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648 +include device/google/wahoo/device.mk + +# Until taimen supports encryption, need an fstab without encryption +PRODUCT_COPY_FILES += \ + device/google/taimen/fstab.hardware:root/fstab.$(PRODUCT_HARDWARE) \ PRODUCT_PROPERTY_OVERRIDES += \ ro.sf.lcd_density=560 \ @@ -31,7 +34,3 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \ camera.disable_treble=true -# Thermal packages -PRODUCT_PACKAGES += \ - thermal.default - diff --git a/fstab.hardware b/fstab.hardware new file mode 100644 index 0000000..73c9270 --- /dev/null +++ b/fstab.hardware @@ -0,0 +1,10 @@ +# Android fstab file. + +# +/dev/block/bootdevice/by-name/system / ext4 ro,barrier=1,discard wait,slotselect +/dev/block/bootdevice/by-name/vendor /vendor ext4 ro,barrier=1 wait,slotselect +/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,barrier=1,noauto_da_alloc,discard wait,check,formattable,encryptable=footer +/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults +/dev/block/bootdevice/by-name/modem /firmware vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect +/devices/soc/a800000.ssusb/a800000.dwc3* auto vfat defaults voldmanaged=usb:auto +# /dev/block/bootdevice/by-name/bluetooth /bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait,slotselect diff --git a/system.prop b/system.prop deleted file mode 100644 index b491b17..0000000 --- a/system.prop +++ /dev/null @@ -1,96 +0,0 @@ - -persist.rild.nitz_plmn= -persist.rild.nitz_long_ons_0= -persist.rild.nitz_long_ons_1= -persist.rild.nitz_long_ons_2= -persist.rild.nitz_long_ons_3= -persist.rild.nitz_short_ons_0= -persist.rild.nitz_short_ons_1= -persist.rild.nitz_short_ons_2= -persist.rild.nitz_short_ons_3= -ril.subscription.types=NV,RUIM -DEVICE_PROVISIONED=1 -# Set network mode to (T/L/G/W/1X/EVDO, T/G/W/L) for 7+5 mode device on DSDS mode -ro.telephony.default_network=22,20 - -debug.sf.hw=1 -debug.gralloc.enable_fb_ubwc=1 - -# system props for the cne module -persist.cne.feature=1 - -# system props for the MM modules -media.stagefright.enable-player=true -media.stagefright.enable-http=true -media.stagefright.enable-aac=true -media.stagefright.enable-qcp=true -media.stagefright.enable-scan=true -mmp.enable.3g2=true -media.aac_51_output_enabled=true -mm.enable.smoothstreaming=true -#13631487 is decimal sum of supported codecs in AAL -#codecs:(PARSER_)AAC AC3 AMR_NB AMR_WB ASF AVI DTS FLV 3GP 3G2 MKV MP2PS MP2TS MP3 OGG QCP WAV FLAC AIFF APE DSD -mm.enable.qcom_parser=13631487 -persist.mm.enable.prefetch=true - -# Additional buffers shared between Camera and Video -vidc.enc.dcvs.extra-buff-count=2 - -# system props for the data netmgrd -persist.data.netmgrd.qos.enable=true -persist.data.mode=concurrent - -# system props for time-services -persist.timed.enable=true - -# System prop to turn on CdmaLTEPhone always -telephony.lteOnCdmaDevice=1 - -# Simulate sdcard on /data/media -persist.fuse_sdcard=true - -# system prop for Bluetooth SOC type -qcom.bluetooth.soc=cherokee - -# system prop for A4WP profile support -ro.bluetooth.a4wp=false - -# system prop for wipower support -ro.bluetooth.wipower=true - -# settings to enable PMD and Device Orientation Sensors -ro.qti.sensors.dev_ori=true -ro.qti.sensors.pmd=true -ro.qti.sensors.sta_detect=true -ro.qti.sensors.mot_detect=true - -#system prop for RmNet Data -persist.rmnet.data.enable=true -persist.data.wda.enable=true -persist.data.df.dl_mode=5 -persist.data.df.ul_mode=5 -persist.data.df.agg.dl_pkt=10 -persist.data.df.agg.dl_size=4096 -persist.data.df.mux_count=8 -persist.data.df.iwlan_mux=9 -persist.data.df.dev_name=rmnet_usb0 - -# -## system props for the data modules -# -#ro.use_data_netmgrd=true -persist.data.netmgrd.qos.enable=true -persist.data.mode=concurrent - -#system prop for Bluetooth SOC type -qcom.bluetooth.soc=cherokee - -#system prop for A4WP profile support -ro.bluetooth.a4wp=false - -#system prop for wipower support -ro.bluetooth.emb_wp_mode=true -ro.bluetooth.wipower=true - -# Property for loading BDA from bdaddress module in kernel -ro.bt.bdaddr_path=/sys/module/bdaddress/parameters/bdaddress