Snap for 8298157 from d8a9805e95
to tm-release
Change-Id: I142a4f2cf5e7212cd43451cf36fe32abe62fddc1
This commit is contained in:
commit
db380f1248
5 changed files with 17 additions and 13 deletions
|
@ -32,7 +32,9 @@ TARGET_CPU_ABI := arm64-v8a
|
||||||
TARGET_CPU_VARIANT := cortex-a55
|
TARGET_CPU_VARIANT := cortex-a55
|
||||||
TARGET_CPU_VARIANT_RUNTIME := cortex-a55
|
TARGET_CPU_VARIANT_RUNTIME := cortex-a55
|
||||||
|
|
||||||
ifeq (,$(filter %tangor tangor% %_64,$(TARGET_PRODUCT)))
|
DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false)
|
||||||
|
|
||||||
|
ifneq ($(DEVICE_IS_64BIT_ONLY),true)
|
||||||
TARGET_2ND_ARCH := arm
|
TARGET_2ND_ARCH := arm
|
||||||
TARGET_2ND_ARCH_VARIANT := armv8-a
|
TARGET_2ND_ARCH_VARIANT := armv8-a
|
||||||
TARGET_2ND_CPU_ABI := armeabi-v7a
|
TARGET_2ND_CPU_ABI := armeabi-v7a
|
||||||
|
|
|
@ -17,10 +17,12 @@
|
||||||
#
|
#
|
||||||
# All components inherited here go to system image
|
# All components inherited here go to system image
|
||||||
#
|
#
|
||||||
ifeq (,$(filter %tangor tangor% %_64,$(TARGET_PRODUCT)))
|
DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false)
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
|
||||||
else
|
ifeq ($(DEVICE_IS_64BIT_ONLY),true)
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
|
||||||
|
else
|
||||||
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
|
||||||
|
|
|
@ -580,9 +580,9 @@ on fs
|
||||||
chown system system /sys/class/dqe0/atc/gain_limit
|
chown system system /sys/class/dqe0/atc/gain_limit
|
||||||
chown system system /sys/class/dqe0/atc/lt_calc_ab_shift
|
chown system system /sys/class/dqe0/atc/lt_calc_ab_shift
|
||||||
chown system system /sys/devices/platform/1c300000.drmdecon/early_wakeup
|
chown system system /sys/devices/platform/1c300000.drmdecon/early_wakeup
|
||||||
chmod 0220 /sys/devices/platform/1c300000.drmdecon/early_wakeup
|
chmod 0660 /sys/devices/platform/1c300000.drmdecon/early_wakeup
|
||||||
chown system system /sys/devices/platform/1c302000.drmdecon/early_wakeup
|
chown system system /sys/devices/platform/1c302000.drmdecon/early_wakeup
|
||||||
chmod 0220 /sys/devices/platform/1c302000.drmdecon/early_wakeup
|
chmod 0660 /sys/devices/platform/1c302000.drmdecon/early_wakeup
|
||||||
|
|
||||||
# Copy DRM Key
|
# Copy DRM Key
|
||||||
# copy /system/app/wv.keys /factory/wv.keys
|
# copy /system/app/wv.keys /factory/wv.keys
|
||||||
|
|
12
device.mk
12
device.mk
|
@ -17,8 +17,9 @@
|
||||||
include device/google/gs-common/device.mk
|
include device/google/gs-common/device.mk
|
||||||
|
|
||||||
TARGET_BOARD_PLATFORM := gs101
|
TARGET_BOARD_PLATFORM := gs101
|
||||||
|
DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false)
|
||||||
|
|
||||||
ifneq (,$(filter %tangor tangor% %_64,$(TARGET_PRODUCT)))
|
ifeq ($(DEVICE_IS_64BIT_ONLY),true)
|
||||||
LOCAL_64ONLY := _64
|
LOCAL_64ONLY := _64
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -903,10 +904,10 @@ ifneq ($(BOARD_WITHOUT_RADIO),true)
|
||||||
$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk)
|
$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq (,$(filter %tangor tangor% %_64,$(TARGET_PRODUCT)))
|
ifeq ($(DEVICE_IS_64BIT_ONLY),true)
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
|
||||||
else
|
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
|
||||||
|
else
|
||||||
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
||||||
endif
|
endif
|
||||||
#$(call inherit-product, hardware/google_devices/exynos5/exynos5.mk)
|
#$(call inherit-product, hardware/google_devices/exynos5/exynos5.mk)
|
||||||
#$(call inherit-product-if-exists, hardware/google_devices/gs101/gs101.mk)
|
#$(call inherit-product-if-exists, hardware/google_devices/gs101/gs101.mk)
|
||||||
|
@ -918,8 +919,7 @@ $(call inherit-product-if-exists, vendor/google/camera/devices/whi/device-vendor
|
||||||
|
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
device/google/gs101/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml \
|
device/google/gs101/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml \
|
||||||
device/google/gs101/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml \
|
device/google/gs101/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml
|
||||||
frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \
|
|
||||||
|
|
||||||
# modem_svc_sit daemon
|
# modem_svc_sit daemon
|
||||||
PRODUCT_PACKAGES += modem_svc_sit
|
PRODUCT_PACKAGES += modem_svc_sit
|
||||||
|
|
|
@ -114,7 +114,7 @@
|
||||||
<hal format="aidl" optional="true">
|
<hal format="aidl" optional="true">
|
||||||
<name>hardware.qorvo.uwb</name>
|
<name>hardware.qorvo.uwb</name>
|
||||||
<interface>
|
<interface>
|
||||||
<name>IUwb</name>
|
<name>IUwbVendor</name>
|
||||||
<instance>default</instance>
|
<instance>default</instance>
|
||||||
</interface>
|
</interface>
|
||||||
</hal>
|
</hal>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue