Skip to content

Commit a8c0e4e

Browse files
committed
support oreo
- temporarily disable wifi & bt - use kernel 4.9.46
1 parent 8366ca3 commit a8c0e4e

File tree

15 files changed

+107
-38
lines changed

15 files changed

+107
-38
lines changed

BoardConfig.mk

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@ BOARD_USERDATAIMAGE_PARTITION_SIZE := 134217728 # 128M
2020

2121
BOARD_FLASH_BLOCK_SIZE := 4096
2222

23+
MALLOC_SVELTE := true
24+
2325
USE_XML_AUDIO_POLICY_CONF := 1
2426

2527
BOARD_GPU_DRIVERS := vc4
2628
USE_OPENGL_RENDERER := true
27-
TARGET_USE_PAN_DISPLAY := true
29+
TARGET_USES_HWC2 := true
2830

2931
# Wifi
3032
BOARD_WLAN_DEVICE := bcmdhd
@@ -33,12 +35,6 @@ BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_bcmdhd
3335
WPA_SUPPLICANT_VERSION := VER_0_8_X
3436
BOARD_WPA_SUPPLICANT_DRIVER := NL80211
3537

36-
# Bluetooth
37-
BOARD_HAVE_BLUETOOTH := true
38-
BOARD_HAVE_BLUETOOTH_BCM := true
39-
BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/brcm/rpi3/bluetooth
40-
BOARD_CUSTOM_BT_CONFIG := device/brcm/rpi3/bluetooth/vnd_rpi3.txt
41-
4238
USE_CAMERA_STUB := true
4339

4440
BOARD_SEPOLICY_DIRS := \

README

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,21 @@ Read it first : https://github.com/android-rpi/local_manifests
33
# Build Kernel
44
Install gcc-arm-linux-gnueabihf
55
$ cd kernel/rpi
6-
$ ARCH=arm scripts/kconfig/merge_config.sh arch/arm/configs/bcm2709_defconfig android/configs/android-base.cfg android/configs/android-recommended.cfg
6+
$ ARCH=arm scripts/kconfig/merge_config.sh arch/arm/configs/bcm2709_defconfig kernel/configs/android-base.config kernel/configs/android-recommended.config
77
$ ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- make zImage
88
$ ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- make dtbs
99

1010
# Install python mako module
1111
sudo apt-get install python-mako
1212

1313
# Patch framework source :
14-
https://github.com/android-rpi/device_brcm_rpi3/wiki#use-hal_pixel_format_bgra_8888
15-
14+
https://github.com/android-rpi/device_brcm_rpi3/wiki/Oreo-:-patch-framework-source
15+
1616
# Build Android source
1717
Continue build with http://source.android.com/source/building.html
1818
$ source build/envsetup.sh
1919
$ lunch rpi3-eng
2020
$ make ramdisk systemimage
21-
22-
# Help for build failure :
23-
https://github.com/android-rpi/device_brcm_rpi3/wiki/Build-Errors
2421

2522
# Prepare sd card
2623
Partitions of the card should be set-up like followings.
@@ -45,6 +42,3 @@ Read it first : https://github.com/android-rpi/local_manifests
4542
# HDMI_MODE : If DVI monitor does not work, try followings for p1:/config.txt
4643
hdmi_group=2
4744
hdmi_mode=85
48-
49-
# How to put Android-TV launcher :
50-
https://github.com/android-rpi/device_brcm_rpi3/wiki#how-to-apply-android-tv-leanback-launcher

boot/bootcode.bin

-20 Bytes
Binary file not shown.

boot/fixup.dat

59 Bytes
Binary file not shown.

boot/start.elf

27.4 KB
Binary file not shown.

init.rpi3.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ on post-fs-data
2020

2121
# Bluetooth
2222
chmod 0660 /sys/class/rfkill/rfkill0/state
23-
chown bluetooth net_bt_stack /sys/class/rfkill/rfkill0/state
24-
chown bluetooth net_bt_stack /sys/class/rfkill/rfkill0/type
23+
chown bluetooth bluetooth /sys/class/rfkill/rfkill0/state
24+
chown bluetooth bluetooth /sys/class/rfkill/rfkill0/type
2525

2626
# Set indication (checked by vold) that we have finished this action
2727
setprop vold.post_fs_data_done 1

manifest.xml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<manifest version="1.0" type="device">
2+
<hal format="hidl">
3+
<name>android.hardware.configstore</name>
4+
<transport>hwbinder</transport>
5+
<version>1.0</version>
6+
<interface>
7+
<name>ISurfaceFlingerConfigs</name>
8+
<instance>default</instance>
9+
</interface>
10+
</hal>
11+
<hal format="hidl">
12+
<name>android.hardware.graphics.allocator</name>
13+
<transport>hwbinder</transport>
14+
<impl level="generic"></impl>
15+
<version>2.0</version>
16+
<interface>
17+
<name>IAllocator</name>
18+
<instance>default</instance>
19+
</interface>
20+
</hal>
21+
<hal format="hidl">
22+
<name>android.hardware.graphics.mapper</name>
23+
<transport arch="32+64">passthrough</transport>
24+
<impl level="generic"></impl>
25+
<version>2.0</version>
26+
<interface>
27+
<name>IMapper</name>
28+
<instance>default</instance>
29+
</interface>
30+
</hal>
31+
<hal format="hidl">
32+
<name>android.hardware.graphics.composer</name>
33+
<transport arch="32+64">passthrough</transport>
34+
<version>2.1</version>
35+
<interface>
36+
<name>IComposer</name>
37+
<instance>default</instance>
38+
</interface>
39+
</hal>
40+
<hal format="hidl">
41+
<name>android.hardware.media.omx</name>
42+
<transport>hwbinder</transport>
43+
<version>1.0</version>
44+
<interface>
45+
<name>IOmx</name>
46+
<instance>default</instance>
47+
</interface>
48+
<interface>
49+
<name>IOmxStore</name>
50+
<instance>default</instance>
51+
</interface>
52+
</hal>
53+
</manifest>

overlay/frameworks/base/core/res/res/values/config.xml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,14 @@
2323
Any other values will have surprising consequences. -->
2424
<integer name="config_defaultUiModeType">4</integer>
2525

26-
<!-- Override long press on home: launch assist intent. -->
27-
<integer name="config_longPressOnHomeBehavior">2</integer>
26+
<!-- Control the behavior when the user long presses the home button.
27+
0 - Nothing
28+
1 - Recent apps view in SystemUI
29+
2 - Launch assist intent
30+
This needs to match the constants in
31+
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
32+
-->
33+
<integer name="config_longPressOnHomeBehavior">0</integer>
2834

2935
<!-- Override configuration check for dpad so that we always appear to have one -->
3036
<bool name="config_hasPermanentDpad">true</bool>
@@ -48,4 +54,15 @@
4854
<item>"9,1"</item>
4955
</string-array>
5056

57+
<!-- Apps that are authorized to access shared accounts -->
58+
<string name="config_appsAuthorizedForSharedAccounts">;com.android.tv.settings;</string>
59+
60+
<!--
61+
Sets the package names whose certificates should be used to
62+
verify location providers are allowed to be loaded.
63+
-->
64+
<string-array name="config_locationProviderPackageNames" translatable="false">
65+
<item>com.android.location.fused</item>
66+
</string-array>
67+
5168
</resources>

overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,6 @@
3232
<!-- Do not give up on DHCP -->
3333
<integer name="def_max_dhcp_retries">0</integer>
3434

35+
<bool name="def_backup_enabled">false</bool>
36+
3537
</resources>

rpi3.mk

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,45 @@ PRODUCT_MANUFACTURER := brcm
99

1010
include frameworks/native/build/tablet-7in-hdpi-1024-dalvik-heap.mk
1111

12+
PRODUCT_PROPERTY_OVERRIDES += \
13+
debug.drm.mode.force=1280x720 \
14+
ro.opengles.version=131072 \
15+
ro.sf.lcd_density=213 \
16+
wifi.interface=wlan0
17+
1218
# application packages
1319
PRODUCT_PACKAGES += \
1420
Launcher2 \
15-
LeanbackLauncher \
16-
Settings \
17-
Browser2
21+
Settings
1822

1923
# system packages
2024
PRODUCT_PACKAGES += \
2125
libGLES_mesa \
22-
gralloc.$(TARGET_PRODUCT) \
23-
hwcomposer.$(TARGET_PRODUCT) \
24-
audio.primary.$(TARGET_PRODUCT) \
26+
gralloc.rpi3 \
27+
hwcomposer.rpi3 \
28+
audio.primary.rpi3 \
2529
audio.usb.default \
2630
wpa_supplicant \
2731
wpa_supplicant.conf
2832

33+
# hardware/interfaces
34+
PRODUCT_PACKAGES += \
35+
36+
37+
38+
39+
40+
41+
42+
43+
2944
# system configurations
3045
PRODUCT_COPY_FILES := \
3146
hardware/broadcom/wlan/bcmdhd/config/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \
3247
frameworks/native/data/etc/android.hardware.ethernet.xml:system/etc/permissions/android.hardware.ethernet.xml \
3348
frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \
3449
frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
35-
frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \
36-
frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \
50+
$(LOCAL_PATH)/manifest.xml:system/vendor/manifest.xml \
3751
$(LOCAL_PATH)/rpi3_core_hardware.xml:system/etc/permissions/rpi3_core_hardware.xml \
3852
$(LOCAL_PATH)/init.rpi3.rc:root/init.rpi3.rc \
3953
$(LOCAL_PATH)/init.usb.rc:root/init.usb.rc \
@@ -42,8 +56,6 @@ PRODUCT_COPY_FILES := \
4256
$(LOCAL_PATH)/Generic.kl:system/usr/keylayout/Generic.kl \
4357
$(LOCAL_PATH)/firmware/brcm/brcmfmac43430-sdio.bin:root/lib/firmware/brcm/brcmfmac43430-sdio.bin \
4458
$(LOCAL_PATH)/firmware/brcm/brcmfmac43430-sdio.txt:root/lib/firmware/brcm/brcmfmac43430-sdio.txt \
45-
$(LOCAL_PATH)/firmware/brcm/BCM43430A1.hcd:root/lib/firmware/brcm/BCM43430A1.hcd \
46-
$(LOCAL_PATH)/bluetooth/bt_vendor.conf:system/etc/bluetooth/bt_vendor.conf \
4759
$(PRODUCT_COPY_FILES)
4860

4961
# media configurations

sepolicy/bluetooth.te

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
allow bluetooth rfkill_device:chr_file rw_file_perms;
2-
allow bluetooth self:socket create_socket_perms;

sepolicy/hal_graphics_allocator.te

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
allow hal_graphics_allocator dri_device:chr_file rw_file_perms;

sepolicy/wpa.te

Lines changed: 0 additions & 1 deletion
This file was deleted.

system.prop

Lines changed: 0 additions & 4 deletions
This file was deleted.

ueventd.rpi3.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
/dev/ttyAMA0 0660 bluetooth net_bt_stack
2-
/dev/rfkill 0660 bluetooth net_bt_stack
1+
/dev/ttyAMA0 0660 bluetooth bluetooth
2+
/dev/rfkill 0660 bluetooth bluetooth

0 commit comments

Comments
 (0)