From 27402de0fb2d09225d4f569854d9864dd6a8ff30 Mon Sep 17 00:00:00 2001 From: Ian Pedowitz Date: Tue, 15 Aug 2017 10:42:33 -0700 Subject: [PATCH] Removing Muskie from oc-mr1-dev and below Bug: 64696168 Test: walleye and aosp_walleye still builds successfully Change-Id: I43c32d842757282462c21ed69aeadec6603b30b6 --- AndroidProducts.mk | 1 - aosp_muskie.mk | 40 ----- device-muskie.mk | 40 ----- muskie/BoardConfig.mk | 31 ---- .../res/res/values-mcc310-mnc004/config.xml | 28 ---- .../res/res/values-mcc311-mnc480/config.xml | 29 ---- .../base/core/res/res/values/config.xml | 114 ------------- .../base/core/res/res/xml/power_profile.xml | 158 ------------------ vendorsetup.sh | 1 - 9 files changed, 442 deletions(-) delete mode 100644 aosp_muskie.mk delete mode 100644 device-muskie.mk delete mode 100644 muskie/BoardConfig.mk delete mode 100644 muskie/overlay/frameworks/base/core/res/res/values-mcc310-mnc004/config.xml delete mode 100644 muskie/overlay/frameworks/base/core/res/res/values-mcc311-mnc480/config.xml delete mode 100644 muskie/overlay/frameworks/base/core/res/res/values/config.xml delete mode 100644 muskie/overlay/frameworks/base/core/res/res/xml/power_profile.xml diff --git a/AndroidProducts.mk b/AndroidProducts.mk index f488362..9357a8a 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -15,6 +15,5 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/aosp_muskie.mk \ $(LOCAL_DIR)/aosp_walleye.mk \ $(LOCAL_DIR)/aosp_walleye_test.mk \ diff --git a/aosp_muskie.mk b/aosp_muskie.mk deleted file mode 100644 index 987e5d5..0000000 --- a/aosp_muskie.mk +++ /dev/null @@ -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 diff --git a/device-muskie.mk b/device-muskie.mk deleted file mode 100644 index 6a38db3..0000000 --- a/device-muskie.mk +++ /dev/null @@ -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 diff --git a/muskie/BoardConfig.mk b/muskie/BoardConfig.mk deleted file mode 100644 index 7e0479f..0000000 --- a/muskie/BoardConfig.mk +++ /dev/null @@ -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/ diff --git a/muskie/overlay/frameworks/base/core/res/res/values-mcc310-mnc004/config.xml b/muskie/overlay/frameworks/base/core/res/res/values-mcc310-mnc004/config.xml deleted file mode 100644 index 05c7683..0000000 --- a/muskie/overlay/frameworks/base/core/res/res/values-mcc310-mnc004/config.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - g2pw2100 - - http://uaprof.vtext.com/htc/g2pw2100/g2pw2100.xml - - diff --git a/muskie/overlay/frameworks/base/core/res/res/values-mcc311-mnc480/config.xml b/muskie/overlay/frameworks/base/core/res/res/values-mcc311-mnc480/config.xml deleted file mode 100644 index a87fec6..0000000 --- a/muskie/overlay/frameworks/base/core/res/res/values-mcc311-mnc480/config.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - g2pw2100 - - http://uaprof.vtext.com/htc/g2pw2100/g2pw2100.xml - - diff --git a/muskie/overlay/frameworks/base/core/res/res/values/config.xml b/muskie/overlay/frameworks/base/core/res/res/values/config.xml deleted file mode 100644 index 95fb95c..0000000 --- a/muskie/overlay/frameworks/base/core/res/res/values/config.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - g2pw2100 - - http://www.gstatic.com/android/sms/G_2PW2100.xml - - - - 5 - 20 - 40 - 100 - 325 - 600 - 1250 - 2200 - 4000 - - - - - 10 - 33 - 49 - 68 - 87 - 108 - 132 - 167 - 206 - 255 - - - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - 600 - - - 6 - - - 13 - - - 98 - - - 86 - - - 4 - - - - "usbradio:adb:diag,serial_cdev,rmnet_gsi,adb:diag,serial_cdev,rmnet_gsi" - "usbradio:mtp,adb:diag,serial_cdev,rmnet_gsi,adb:diag,serial_cdev,rmnet_gsi" - "usbradio:mtp:diag,serial_cdev,rmnet_gsi:diag,serial_cdev,rmnet_gsi" - "usbradio:rndis,adb:rndis,diag,adb:diag,serial_cdev,rmnet_gsi" - "usbradio:rndis:rndis,diag:diag,serial_cdev,rmnet_gsi" - - - diff --git a/muskie/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/muskie/overlay/frameworks/base/core/res/res/xml/power_profile.xml deleted file mode 100644 index 2c96682..0000000 --- a/muskie/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - 15 - - 14.38 - - 30 - - 50 - 5 - - 6 - 5 - 4 - 3 - 3 - - - 0 - - - 4 - 4 - - - - - 300000 - 364800 - 441600 - 518400 - 595200 - 672000 - 748800 - 825600 - 883200 - 960000 - 1036800 - 1094400 - 1171200 - 1248000 - 1324800 - 1401600 - 1478400 - 1555200 - 1670400 - 1747200 - 1824000 - 1900800 - - - - 103.348000 - 108.472000 - 133.136993 - 111.133003 - 107.376999 - 111.085999 - 104.720001 - 109.449997 - 138.858002 - 111.936996 - 133.197998 - 118.005005 - 117.300003 - 146.181000 - 117.845001 - 123.345993 - 125.492004 - 153.684998 - 132.847000 - 160.753998 - 138.453995 - 149.253998 - - - - - 300000 - 345600 - 422400 - 499200 - 576000 - 652800 - 729600 - 806400 - 902400 - 979200 - 1056000 - 1132800 - 1190400 - 1267200 - 1344000 - 1420800 - 1497600 - 1574400 - 1651200 - 1728000 - 1804800 - 1881600 - 1958400 - 2035200 - 2112000 - 2208000 - 2265600 - 2323200 - 2342400 - 2361600 - 2457600 - - - - 143.03 - 97.95 - 104.41 - 103.54 - 107.21 - 152.82 - 156.37 - 106.92 - 106.44 - 113.09 - 156.63 - 152.48 - 136.45 - 177.21 - 120.17 - 166.94 - 138.59 - 197.52 - 161.63 - 163.24 - 175.34 - 183.17 - 252.96 - 230.71 - 286.02 - 288.12 - 336.74 - 325.27 - 367.62 - 369.38 - 342.99 - - 161.74 - 122.66 - 240.10 - 1157.88 - 3830 - diff --git a/vendorsetup.sh b/vendorsetup.sh index 531b8b1..2d8c55b 100755 --- a/vendorsetup.sh +++ b/vendorsetup.sh @@ -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