From 186f2805f23d2e77ce026cd332c7f4628f021efe Mon Sep 17 00:00:00 2001 From: Zips Date: Mon, 6 Nov 2017 22:13:49 -0500 Subject: deb: init oreo 1.- Initial port to Oreo 2.- Fix Maintainers 3.- Added manifest 4.- Correct Path to Inherity AICP's stuff 5.- Fix Wifi 6.- Added Wifi on Boot 7.- Fix dependencies Change-Id: Ib15e08bfa72e00168614dad8b2fe0018fe280d7f --- BoardConfig.mk | 2 + aicp.dependencies | 15 ++--- aicp.mk | 32 +++++++++ device.mk | 8 ++- init.deb.rc | 15 +++-- manifest.xml | 75 ++++++++++++++++++++++ .../frameworks/base/core/res/res/values/config.xml | 28 -------- .../SettingsProvider/res/values/defaults.xml | 2 + .../services/Telephony/res/values/strings.xml | 38 ----------- sepolicy/audioserver.te | 6 -- 10 files changed, 131 insertions(+), 90 deletions(-) create mode 100644 aicp.mk create mode 100644 manifest.xml delete mode 100644 overlay/packages/services/Telephony/res/values/strings.xml delete mode 100644 sepolicy/audioserver.te diff --git a/BoardConfig.mk b/BoardConfig.mk index 7033fe9..92b4d1b 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -18,6 +18,8 @@ TARGET_BOOTLOADER_BOARD_NAME := deb TARGET_BOOTLOADER_NAME := deb TARGET_BOARD_INFO_FILE := device/asus/deb/board-info.txt +DEVICE_MANIFEST_FILE := device/asus/deb/manifest.xml + BOARD_HAL_STATIC_LIBRARIES := libdumpstate.deb TARGET_RELEASETOOLS_EXTENSIONS := device/asus/deb diff --git a/aicp.dependencies b/aicp.dependencies index ea3d1f1..beeec26 100644 --- a/aicp.dependencies +++ b/aicp.dependencies @@ -1,22 +1,17 @@ [ { - "repository": "AICP/device_asus_flo", + "repository": "LineageOS/android_device_asus_flo", "target_path": "device/asus/flo", - "branch": "n7.1-cm" + "branch": "lineage-15.0" }, { "repository": "LineageOS/android_kernel_google_msm", "target_path": "kernel/google/msm", - "branch": "cm-14.1" + "branch": "lineage-15.0" }, { - "repository": "AICP/proprietary_vendor_asus", + "repository": "Flex1911/proprietary_vendor_asus", "target_path": "vendor/asus", - "branch": "n7.1-cm" - }, - { - "repository": "LineageOS/android_external_stlport", - "target_path": "external/stlport", - "branch": "cm-14.1" + "branch": "lineage-15.0" } ] diff --git a/aicp.mk b/aicp.mk new file mode 100644 index 0000000..3b969e0 --- /dev/null +++ b/aicp.mk @@ -0,0 +1,32 @@ +# Release name +PRODUCT_RELEASE_NAME := deb + +# Inherit some AICP stuff. +$(call inherit-product, vendor/aicp/config/common_full_phone.mk) + +# Inherit device configuration +$(call inherit-product, device/asus/deb/full_deb.mk) + +## Device identifier. This must come after all inclusions +PRODUCT_DEVICE := deb +PRODUCT_NAME := aicp_deb +PRODUCT_BRAND := Google +PRODUCT_MODEL := Nexus 7 2013 LTE +PRODUCT_MANUFACTURER := Asus + +PRODUCT_RESTRICT_VENDOR_FILES := false + +#Set build fingerprint / ID / Product Name ect. +PRODUCT_BUILD_PROP_OVERRIDES += \ + PRODUCT_NAME=razorg \ + BUILD_FINGERPRINT=google/razorg/deb:6.0.1/MOB30X/3036618:user/release-keys \ + PRIVATE_BUILD_DESC="razorg-user 6.0.1 MOB30X 3036618 release-keys" + +# AICP Device Maintainers +PRODUCT_BUILD_PROP_OVERRIDES += \ + DEVICE_MAINTAINERS="HC (Zips)" + +# Boot animation +TARGET_SCREEN_HEIGHT := 1920 +TARGET_SCREEN_WIDTH := 1080 +-include vendor/aicp/configs/bootanimation.mk diff --git a/device.mk b/device.mk index b72cc41..e414f82 100644 --- a/device.mk +++ b/device.mk @@ -28,7 +28,11 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml PRODUCT_PACKAGES += \ - camera.deb + camera.msm8960 + +PRODUCT_PACKAGES += \ + android.hardware.radio@1.0-impl \ + android.hardware.radio.deprecated@1.0-impl #NFC PRODUCT_PACKAGES += \ @@ -41,8 +45,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ rild.libpath=/system/lib/libril-qc-qmi-1.so -PRODUCT_PACKAGES += \ - hostapd_default.conf # the actual meat of the device-specific product definition $(call inherit-product, device/asus/flo/device-common.mk) diff --git a/init.deb.rc b/init.deb.rc index 3ac5980..e561523 100644 --- a/init.deb.rc +++ b/init.deb.rc @@ -124,6 +124,8 @@ on boot write /proc/sys/net/core/rmem_max 2097152 write /proc/sys/net/core/wmem_max 2097152 + chown wifi wifi /sys/module/wlan/parameters/fwpath + # msm specific files that need to be created on /data on post-fs-data chown system system /dev/wcnss_wlan @@ -274,14 +276,17 @@ service sensors /system/bin/sensors.qcom user root group root -service wpa_supplicant /system/bin/wpa_supplicant \ +service wpa_supplicant /vendor/bin/hw/wpa_supplicant \ + -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf \ + -I/system/etc/wifi/p2p_supplicant_overlay.conf -N \ -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \ -I/system/etc/wifi/wpa_supplicant_overlay.conf \ + -puse_p2p_group_interface=1 \ -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0 - # we will start as root and wpa_supplicant will switch to user wifi - # after setting up the capabilities required for WEXT - # user wifi - # group wifi inet keystore +# we will start as root and wpa_supplicant will switch to user wifi +# after setting up the capabilities required for WEXT +# user wifi +# group wifi inet keystore class main socket wpa_wlan0 dgram 660 wifi wifi disabled diff --git a/manifest.xml b/manifest.xml new file mode 100644 index 0000000..8068c45 --- /dev/null +++ b/manifest.xml @@ -0,0 +1,75 @@ + + + android.hardware.graphics.allocator + passthrough + 2.0 + + IAllocator + default + + + + android.hardware.wifi + hwbinder + 1.0 + + IWifi + default + + + + android.hardware.wifi.supplicant + hwbinder + 1.0 + + ISupplicant + default + + + + android.hardware.nfc + hwbinder + 1.0 + + INfc + default + + + + android.hardware.drm + hwbinder + 1.0 + + ICryptoFactory + widevine + default + + + IDrmFactory + widevine + default + + + + android.hardware.radio + hwbinder + 1.0 + + IRadio + slot1 + + + ISap + slot1 + + + + android.hardware.radio.deprecated + hwbinder + 1.0 + + IOemHook + slot1 + + + diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index b99ffee..b8b1442 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -277,34 +277,6 @@ format is UMTS|LTE|... --> GSM | WCDMA | LTE - - 64 - - - 64 - true diff --git a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml index 1e615ef..8b6fe33 100644 --- a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml +++ b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml @@ -17,6 +17,8 @@ */ --> + + true 30000 diff --git a/overlay/packages/services/Telephony/res/values/strings.xml b/overlay/packages/services/Telephony/res/values/strings.xml deleted file mode 100644 index 36ded54..0000000 --- a/overlay/packages/services/Telephony/res/values/strings.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - @string/preferred_network_mode_gsm_only_choice - @string/preferred_network_mode_gsm_wcdma_auto_choice - @string/preferred_network_mode_gsm_wcdma_preferred_choice - @string/preferred_network_mode_wcdma_only_choice - @string/preferred_network_mode_gsm_wcdma_lte_choice - @string/preferred_network_mode_lte_wcdma_choice - @string/preferred_network_mode_lte_choice - - - - "1" - "3" - "0" - "2" - "9" - "12" - "11" - - \ No newline at end of file diff --git a/sepolicy/audioserver.te b/sepolicy/audioserver.te deleted file mode 100644 index ad17e68..0000000 --- a/sepolicy/audioserver.te +++ /dev/null @@ -1,6 +0,0 @@ -# Audioserver - -allow audioserver self:socket { create ioctl read }; -allow audioserver qmuxd_socket:dir { add_name write search }; -allow audioserver qmuxd_socket:sock_file { create write setattr }; -allow audioserver qmux:unix_stream_socket connectto; -- cgit v1.2.3