Removing Muskie from oc-mr1-dev and below

Bug: 64696168
Test: walleye and aosp_walleye still builds successfully
Change-Id: I43c32d842757282462c21ed69aeadec6603b30b6
This commit is contained in:
Ian Pedowitz
2017-08-15 10:42:33 -07:00
parent f2d5e412b9
commit 27402de0fb
9 changed files with 0 additions and 442 deletions

View File

@@ -15,6 +15,5 @@
#
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/aosp_muskie.mk \
$(LOCAL_DIR)/aosp_walleye.mk \
$(LOCAL_DIR)/aosp_walleye_test.mk \

View File

@@ -1,40 +0,0 @@
#
# Copyright 2016 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.
#
# Inherit from the common Open Source product configuration
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
$(call inherit-product, device/google/muskie/device-muskie.mk)
$(call inherit-product-if-exists, vendor/google_devices/muskie/proprietary/device-vendor-muskie.mk)
PRODUCT_PACKAGES += \
Dialer \
Launcher3 \
WallpaperPicker
PRODUCT_COPY_FILES += \
device/google/muskie/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf
PRODUCT_RESTRICT_VENDOR_FILES := owner
PRODUCT_MANUFACTURER := Google
PRODUCT_BRAND := Android
PRODUCT_NAME := aosp_muskie
PRODUCT_DEVICE := muskie
PRODUCT_MODEL := AOSP on muskie

View File

@@ -1,40 +0,0 @@
#
# Copyright 2016 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.
#
PRODUCT_AAPT_CONFIG := normal
PRODUCT_AAPT_PREF_CONFIG := 560dpi
PRODUCT_AAPT_PREBUILT_DPI := xxxhdpi xxhdpi xhdpi hdpi
PRODUCT_HARDWARE := muskie
# DEVICE_PACKAGE_OVERLAYS for the device should be before
# including common overlays since the one listed first
# takes precedence.
ifdef DEVICE_PACKAGE_OVERLAYS
$(warning Overlays defined in '$(DEVICE_PACKAGE_OVERLAYS)' will override '$(PRODUCT_HARDWARE)' overlays)
endif
DEVICE_PACKAGE_OVERLAYS += device/google/muskie/muskie/overlay
include device/google/muskie/device-common.mk
PRODUCT_PROPERTY_OVERRIDES += \
ro.sf.lcd_density=560 \
# HWUI cache sizes
PRODUCT_PROPERTY_OVERRIDES += \
ro.hwui.texture_cache_size=72 \
ro.hwui.layer_cache_size=48 \
ro.hwui.path_cache_size=32

View File

@@ -1,31 +0,0 @@
#
# Copyright (C) 2016 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.
#
TARGET_BOOTLOADER_BOARD_NAME := muskie
DEFAULT_LOW_PERSISTENCE_MODE_BRIGHTNESS := 0x00000056
include device/google/wahoo/BoardConfig.mk
-include vendor/google_devices/muskie/proprietary/BoardConfigVendor.mk
BOARD_BOOTIMAGE_PARTITION_SIZE := 33554432
#sepolicy common to muskie/walleye
BOARD_SEPOLICY_DIRS += device/google/muskie/sepolicy
# Testing related defines
BOARD_PERFSETUP_SCRIPT := platform_testing/scripts/perf-setup/wahoo-setup.sh
BOARD_LISA_TARGET_SCRIPTS := device/google/wahoo/lisa/

View File

@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2016, 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.
*/
-->
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
<!-- MMS user agent string -->
<string name="config_mms_user_agent" translatable="false">g2pw2100</string>
<!-- MMS user agent prolfile url -->
<string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.vtext.com/htc/g2pw2100/g2pw2100.xml</string>
</resources>

View File

@@ -1,29 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2016, 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.
*/
-->
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
<!-- MMS user agent string -->
<string name="config_mms_user_agent" translatable="false">g2pw2100</string>
<!-- MMS user agent prolfile url -->
<string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.vtext.com/htc/g2pw2100/g2pw2100.xml</string>
</resources>

View File

@@ -1,114 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2016, 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.
*/
-->
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
<!-- MMS user agent string -->
<string name="config_mms_user_agent" translatable="false">g2pw2100</string>
<!-- MMS user agent prolfile url -->
<string name="config_mms_user_agent_profile_url" translatable="false">http://www.gstatic.com/android/sms/G_2PW2100.xml</string>
<!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.
The N entries of this array define N 1 zones as follows:
Zone 0: 0 <= LUX < array[0]
Zone 1: array[0] <= LUX < array[1]
...
Zone N: array[N - 1] <= LUX < array[N]
Zone N + 1 array[N] <= LUX < infinity
Must be overridden in platform specific overlays -->
<integer-array name="config_autoBrightnessLevels">
<item>5</item>
<item>20</item>
<item>40</item>
<item>100</item>
<item>325</item>
<item>600</item>
<item>1250</item>
<item>2200</item>
<item>4000</item>
</integer-array>
<!-- Array of output values for LCD backlight corresponding to the LUX values
in the config_autoBrightnessLevels array. This array should have size one greater
than the size of the config_autoBrightnessLevels array.
This must be overridden in platform specific overlays -->
<integer-array name="config_autoBrightnessLcdBacklightValues">
<item>10</item> <!-- 0-5 -->
<item>33</item> <!-- 5-20 -->
<item>49</item> <!-- 20-40 -->
<item>68</item> <!-- 40-100 -->
<item>87</item> <!-- 100-325 -->
<item>108</item> <!-- 325-600 -->
<item>132</item> <!-- 600-1250 -->
<item>167</item> <!-- 1250-2200 -->
<item>206</item> <!-- 2200-4000 -->
<item>255</item> <!-- 4000+ -->
</integer-array>
<!-- Array of output values for button backlight corresponding to the LUX values
in the config_autoBrightnessLevels array. This array should have size one greater
than the size of the config_autoBrightnessLevels array.
This must be overridden in platform specific overlays -->
<integer-array name="config_autoBrightnessButtonBacklightValues">
<item>0</item>
<item>0</item>
<item>0</item>
<item>0</item>
<item>0</item>
<item>0</item>
<item>0</item>
<item>0</item>
<item>0</item>
<item>0</item>
</integer-array>
<!-- Shutdown if the battery temperature exceeds (this value * 0.1) Celsius. -->
<integer name="config_shutdownBatteryTemperature">600</integer>
<!-- Minimum screen brightness allowed by the power manager. -->
<integer name="config_screenBrightnessDim">6</integer>
<!-- Screen brightness when dozing. -->
<integer name="config_screenBrightnessDoze">13</integer>
<!-- Default screen brightness setting.
Must be in the range specified by minimum and maximum. -->
<integer name="config_screenBrightnessSettingDefault">98</integer>
<!-- Default screen brightness for VR setting. Default value: 0x56 => 86. -->
<integer name="config_screenBrightnessForVrSettingDefault">86</integer>
<!-- Minimum screen brightness setting allowed by the power manager.
The user is forbidden from setting the brightness below this level. -->
<integer name="config_screenBrightnessSettingMinimum">4</integer>
<!-- Values for USB port setting. in format of bootmode:current function:new function -->
<string-array translatable="false" name="config_oemUsbModeOverride">
<item>"usbradio:adb:diag,serial_cdev,rmnet_gsi,adb:diag,serial_cdev,rmnet_gsi"</item>
<item>"usbradio:mtp,adb:diag,serial_cdev,rmnet_gsi,adb:diag,serial_cdev,rmnet_gsi"</item>
<item>"usbradio:mtp:diag,serial_cdev,rmnet_gsi:diag,serial_cdev,rmnet_gsi"</item>
<item>"usbradio:rndis,adb:rndis,diag,adb:diag,serial_cdev,rmnet_gsi"</item>
<item>"usbradio:rndis:rndis,diag:diag,serial_cdev,rmnet_gsi"</item>
</string-array>
</resources>

View File

@@ -1,158 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<device name="Android">
<!-- Item not being relevant anymore:
bluetooth.active, bluetooth.on,
wifi.on, wifi.active, wifi.scan as they shoud be provided by WifiActivityEnergyInfo
dsp.audio, dsp.video
-->
<item name="cpu.idle">15</item>
<item name="cpu.awake">14.38</item>
<item name="gps.on">30</item>
<item name="radio.active">50</item>
<item name="radio.scanning">5</item>
<array name="radio.on"> <!-- Strength 0 to BINS-1 -->
<value>6</value> <!-- none -->
<value>5</value> <!-- poor -->
<value>4</value> <!-- moderate -->
<value>3</value> <!-- good -->
<value>3</value> <!-- great -->
</array>
<item name="wifi.controller.voltage">0</item>
<array name="cpu.clusters.cores">
<value>4</value> <!-- Cluster 0 has 4 cores (cpu0, cpu1, cpu2, cpu3) -->
<value>4</value> <!-- Cluster 1 has 4 cores (cpu4, cpu5, cpu5, cpu7) -->
</array>
<!-- Different CPU speeds as reported in
/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state -->
<array name="cpu.speeds.cluster0">
<value>300000</value>
<value>364800</value>
<value>441600</value>
<value>518400</value>
<value>595200</value>
<value>672000</value>
<value>748800</value>
<value>825600</value>
<value>883200</value>
<value>960000</value>
<value>1036800</value>
<value>1094400</value>
<value>1171200</value>
<value>1248000</value>
<value>1324800</value>
<value>1401600</value>
<value>1478400</value>
<value>1555200</value>
<value>1670400</value>
<value>1747200</value>
<value>1824000</value>
<value>1900800</value>
</array>
<array name="cpu.active.cluster0">
<value>103.348000</value>
<value>108.472000</value>
<value>133.136993</value>
<value>111.133003</value>
<value>107.376999</value>
<value>111.085999</value>
<value>104.720001</value>
<value>109.449997</value>
<value>138.858002</value>
<value>111.936996</value>
<value>133.197998</value>
<value>118.005005</value>
<value>117.300003</value>
<value>146.181000</value>
<value>117.845001</value>
<value>123.345993</value>
<value>125.492004</value>
<value>153.684998</value>
<value>132.847000</value>
<value>160.753998</value>
<value>138.453995</value>
<value>149.253998</value>
</array>
<!-- Different CPU speeds as reported in
/sys/devices/system/cpu/cpu4/cpufreq/stats/time_in_state -->
<array name="cpu.speeds.cluster1">
<value>300000</value>
<value>345600</value>
<value>422400</value>
<value>499200</value>
<value>576000</value>
<value>652800</value>
<value>729600</value>
<value>806400</value>
<value>902400</value>
<value>979200</value>
<value>1056000</value>
<value>1132800</value>
<value>1190400</value>
<value>1267200</value>
<value>1344000</value>
<value>1420800</value>
<value>1497600</value>
<value>1574400</value>
<value>1651200</value>
<value>1728000</value>
<value>1804800</value>
<value>1881600</value>
<value>1958400</value>
<value>2035200</value>
<value>2112000</value>
<value>2208000</value>
<value>2265600</value>
<value>2323200</value>
<value>2342400</value>
<value>2361600</value>
<value>2457600</value>
</array>
<array name="cpu.active.cluster1">
<value>143.03</value>
<value>97.95</value>
<value>104.41</value>
<value>103.54</value>
<value>107.21</value>
<value>152.82</value>
<value>156.37</value>
<value>106.92</value>
<value>106.44</value>
<value>113.09</value>
<value>156.63</value>
<value>152.48</value>
<value>136.45</value>
<value>177.21</value>
<value>120.17</value>
<value>166.94</value>
<value>138.59</value>
<value>197.52</value>
<value>161.63</value>
<value>163.24</value>
<value>175.34</value>
<value>183.17</value>
<value>252.96</value>
<value>230.71</value>
<value>286.02</value>
<value>288.12</value>
<value>336.74</value>
<value>325.27</value>
<value>367.62</value>
<value>369.38</value>
<value>342.99</value>
</array>
<item name="screen.on">161.74</item>
<item name="screen.full">122.66</item>
<item name="camera.flashlight">240.10</item>
<item name="camera.avg">1157.88</item>
<item name="battery.capacity">3830</item>
</device>

View File

@@ -14,6 +14,5 @@
# limitations under the License.
#
add_lunch_combo aosp_muskie-userdebug
add_lunch_combo aosp_walleye-userdebug
add_lunch_combo aosp_walleye_test-userdebug