Skip to content

Commit 163acc8

Browse files
committed
VERTEX-fy
1 parent 13bc753 commit 163acc8

File tree

8 files changed

+51
-14
lines changed

8 files changed

+51
-14
lines changed

AndroidProducts.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
PRODUCT_MAKEFILES := \
2+
$(LOCAL_DIR)/device.mk \
3+
$(LOCAL_DIR)/Android.mk \
4+
$(LOCAL_DIR)/vertex_oneplus2.mk

device.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,6 @@ PRODUCT_PACKAGES += \
137137
PRODUCT_PACKAGES += \
138138
fs_config_files
139139

140-
PRODUCT_PROPERTY_OVERRIDES += \
141-
ro.du.updater=oneplus2
142-
143140
# GPS
144141
PRODUCT_PACKAGES += \
145142
gps.msm8994 \

init/init_oneplus2.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636

3737
void init_variant_properties() {
3838

39-
std::string device = property_get("ro.du.device");
39+
std::string device = property_get("ro.product.device");
4040
std::string rf_version;
4141

42-
if (device != "oneplus2")
42+
if (device != "OnePlus2")
4343
return;
4444

4545
rf_version = property_get("ro.boot.rf_v1");

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,14 @@
7171

7272
<!-- Does the notification LED support multiple colors?
7373
Used to decide if the user can change the colors -->
74-
<bool name="config_multiColorNotificationLed">true</bool>
7574

7675
<!-- Does the battery LED support multiple colors?
7776
Used to decide if the user can change the colors -->
78-
<bool name="config_multiColorBatteryLed">true</bool>
7977

8078
<!-- Is the notification LED intrusive? Used to decide if there should be a disable option -->
8179
<bool name="config_intrusiveNotificationLed">true</bool>
8280

8381
<!-- Is the battery LED intrusive? Used to decide if there should be a disable option -->
84-
<bool name="config_intrusiveBatteryLed">true</bool>
8582

8683
<!-- Button illumination
8784
<bool name="config_deviceHasVariableButtonBrightness">true</bool> -->
@@ -420,6 +417,5 @@
420417

421418
<!-- Do the battery/notification LEDs support pulsing?
422419
Used to decide if we show pulse settings -->
423-
<bool name="config_ledCanPulse">true</bool>
424420

425421
</resources>

vendorsetup.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
add_lunch_combo du_oneplus2-user
2-
add_lunch_combo du_oneplus2-userdebug
3-
add_lunch_combo du_oneplus2-eng
1+
add_lunch_combo vertex_oneplus2-userdebug
File renamed without changes.

du.mk renamed to vertex.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
2020
$(call inherit-product, device/oneplus/oneplus2/device.mk)
2121

2222
# Inherit some common du stuff.
23-
$(call inherit-product, vendor/du/config/common_full_phone.mk)
23+
$(call inherit-product, vendor/vertex/config/common_full_phone.mk)
2424

25-
PRODUCT_NAME := du_oneplus2
25+
PRODUCT_NAME := vertex_oneplus2
2626
PRODUCT_DEVICE := oneplus2
2727
PRODUCT_MANUFACTURER := OnePlus
2828
PRODUCT_BRAND := OnePlus

vertex_oneplus2.mk

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Copyright (C) 2016 The CyanogenMod Project
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
# Inherit from those products. Most specific first.
16+
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
17+
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
18+
19+
# Inherit from oneplus2 device
20+
$(call inherit-product, device/oneplus/oneplus2/device.mk)
21+
22+
# Inherit some common du stuff.
23+
$(call inherit-product, vendor/vertex/config/common_full_phone.mk)
24+
25+
PRODUCT_NAME := vertex_oneplus2
26+
PRODUCT_DEVICE := oneplus2
27+
PRODUCT_MANUFACTURER := OnePlus
28+
PRODUCT_BRAND := OnePlus
29+
30+
PRODUCT_GMS_CLIENTID_BASE := android-oneplus
31+
32+
TARGET_VENDOR_PRODUCT_NAME := OnePlus2
33+
TARGET_VENDOR_DEVICE_NAME := OnePlus2
34+
PRODUCT_BUILD_PROP_OVERRIDES += TARGET_DEVICE=OnePlus2 PRODUCT_NAME=OnePlus2
35+
36+
PRODUCT_BUILD_PROP_OVERRIDES += \
37+
BUILD_FINGERPRINT=OnePlus/OnePlus2/OnePlus2:6.0.1/MMB29M/1447840920:user/release-keys \
38+
PRIVATE_BUILD_DESC="OnePlus2-user 6.0.1 MMB29M 20 dev-keys"
39+
40+
PRODUCT_SYSTEM_PROPERTY_BLACKLIST += ro.product.model
41+
42+
TARGET_VENDOR := oneplus

0 commit comments

Comments
 (0)