Skip to content

Commit

Permalink
VERTEX-fy
Browse files Browse the repository at this point in the history
  • Loading branch information
vibhoothi committed Mar 10, 2017
1 parent 13bc753 commit 163acc8
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 14 deletions.
4 changes: 4 additions & 0 deletions AndroidProducts.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/device.mk \
$(LOCAL_DIR)/Android.mk \
$(LOCAL_DIR)/vertex_oneplus2.mk
3 changes: 0 additions & 3 deletions device.mk
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,6 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
fs_config_files

PRODUCT_PROPERTY_OVERRIDES += \
ro.du.updater=oneplus2

# GPS
PRODUCT_PACKAGES += \
gps.msm8994 \
Expand Down
4 changes: 2 additions & 2 deletions init/init_oneplus2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@

void init_variant_properties() {

std::string device = property_get("ro.du.device");
std::string device = property_get("ro.product.device");
std::string rf_version;

if (device != "oneplus2")
if (device != "OnePlus2")
return;

rf_version = property_get("ro.boot.rf_v1");
Expand Down
4 changes: 0 additions & 4 deletions overlay/frameworks/base/core/res/res/values/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,14 @@

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

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

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

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

<!-- Button illumination
<bool name="config_deviceHasVariableButtonBrightness">true</bool> -->
Expand Down Expand Up @@ -420,6 +417,5 @@

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

</resources>
4 changes: 1 addition & 3 deletions vendorsetup.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
add_lunch_combo du_oneplus2-user
add_lunch_combo du_oneplus2-userdebug
add_lunch_combo du_oneplus2-eng
add_lunch_combo vertex_oneplus2-userdebug
File renamed without changes.
4 changes: 2 additions & 2 deletions du.mk → vertex.mk
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
$(call inherit-product, device/oneplus/oneplus2/device.mk)

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

PRODUCT_NAME := du_oneplus2
PRODUCT_NAME := vertex_oneplus2
PRODUCT_DEVICE := oneplus2
PRODUCT_MANUFACTURER := OnePlus
PRODUCT_BRAND := OnePlus
Expand Down
42 changes: 42 additions & 0 deletions vertex_oneplus2.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Copyright (C) 2016 The CyanogenMod 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 those products. Most specific first.
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)

# Inherit from oneplus2 device
$(call inherit-product, device/oneplus/oneplus2/device.mk)

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

PRODUCT_NAME := vertex_oneplus2
PRODUCT_DEVICE := oneplus2
PRODUCT_MANUFACTURER := OnePlus
PRODUCT_BRAND := OnePlus

PRODUCT_GMS_CLIENTID_BASE := android-oneplus

TARGET_VENDOR_PRODUCT_NAME := OnePlus2
TARGET_VENDOR_DEVICE_NAME := OnePlus2
PRODUCT_BUILD_PROP_OVERRIDES += TARGET_DEVICE=OnePlus2 PRODUCT_NAME=OnePlus2

PRODUCT_BUILD_PROP_OVERRIDES += \
BUILD_FINGERPRINT=OnePlus/OnePlus2/OnePlus2:6.0.1/MMB29M/1447840920:user/release-keys \
PRIVATE_BUILD_DESC="OnePlus2-user 6.0.1 MMB29M 20 dev-keys"

PRODUCT_SYSTEM_PROPERTY_BLACKLIST += ro.product.model

TARGET_VENDOR := oneplus

0 comments on commit 163acc8

Please sign in to comment.