summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keylayout/gpio-keys.kl32
-rw-r--r--proprietary-files.txt2
-rw-r--r--wayne.mk22
3 files changed, 7 insertions, 49 deletions
diff --git a/keylayout/gpio-keys.kl b/keylayout/gpio-keys.kl
deleted file mode 100644
index 7d5afc3..0000000
--- a/keylayout/gpio-keys.kl
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (c) 2013, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-key 115 VOLUME_UP
-key 114 VOLUME_DOWN
-key 102 HOME
-key 528 FOCUS
-key 766 CAMERA
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 325f8b5..b68a91c 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1365,7 +1365,7 @@ etc/permissions/embms.xml
etc/permissions/qcrilhook.xml
etc/permissions/telephonyservice.xml
framework/embmslibrary.jar
--framework/qcrilhook.jar
+framework/qcrilhook.jar
framework/qti-telephony-common.jar|e529711775c31da38c9ecd1ab94b27ee15570dc4
framework/QtiTelephonyServicelibrary.jar
-priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
diff --git a/wayne.mk b/wayne.mk
index 5b34a68..fb36356 100644
--- a/wayne.mk
+++ b/wayne.mk
@@ -144,18 +144,16 @@ PRODUCT_PACKAGES += \
PRODUCT_BOOT_JARS += \
org.ifaa.android.manager
+# Camera
PRODUCT_PACKAGES += \
Snap
PRODUCT_PACKAGES += \
android.hardware.camera.provider@2.4-impl:32 \
- android.hardware.camera.provider@2.4-service \
- vendor.qti.hardware.camera.device@1.0 \
- vendor.qti.hardware.camera.device@1.0_vendor
+ android.hardware.camera.provider@2.4-service
# Connectivity Engine support (CNE)
PRODUCT_PACKAGES += \
- libcnefeatureconfig \
cneapiclient \
com.quicinc.cne \
services-ext
@@ -184,6 +182,7 @@ PRODUCT_PACKAGES += \
libqdMetaData.system
PRODUCT_PACKAGES += \
+ android.frameworks.displayservice@1.0_32 \
android.hardware.graphics.allocator@2.0-impl:64 \
android.hardware.graphics.allocator@2.0-service \
android.hardware.graphics.mapper@2.0-impl \
@@ -222,11 +221,7 @@ PRODUCT_PACKAGES += \
android.hardware.gnss@1.0-service-qti \
libgnss \
libgnsspps \
- libgps.utils \
- liblocation_api \
- libloc_core \
- libloc_pla \
- libvehiclenetwork-native
+ libsensorndkbridge
PRODUCT_COPY_FILES += \
$(COMMON_PATH)/configs/gps/flp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/flp.conf \
@@ -281,7 +276,6 @@ PRODUCT_COPY_FILES += \
# Keylayout
PRODUCT_COPY_FILES += \
- $(COMMON_PATH)/keylayout/gpio-keys.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/gpio-keys.kl \
$(COMMON_PATH)/keylayout/sdm660-snd-card_Button_Jack.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/sdm660-snd-card_Button_Jack.kl \
$(COMMON_PATH)/keylayout/uinput-fpc.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput-fpc.kl \
$(COMMON_PATH)/keylayout/uinput-goodix.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput-goodix.kl
@@ -336,8 +330,7 @@ PRODUCT_PACKAGES += \
# Power
PRODUCT_PACKAGES += \
- power.sdm660 \
- android.hardware.power@1.1-service-qti \
+ android.hardware.power@1.1-service-qti
# Public Libraries
PRODUCT_COPY_FILES += \
@@ -378,7 +371,6 @@ PRODUCT_PACKAGES += \
telephony-ext
PRODUCT_BOOT_JARS += \
- qcrilhook \
telephony-ext
# Seccomp policy
@@ -388,7 +380,6 @@ PRODUCT_COPY_FILES += \
# Sensors
PRODUCT_PACKAGES += \
- sensors.sdm660 \
android.hardware.sensors@1.0-impl:64 \
android.hardware.sensors@1.0-service
@@ -419,8 +410,7 @@ PRODUCT_PACKAGES += \
# USB
PRODUCT_PACKAGES += \
- android.hardware.usb@1.0-service.basic \
- com.android.future.usb.accessory
+ android.hardware.usb@1.0-service.basic
# Vibrator
PRODUCT_PACKAGES += \