Evolution-X-Tensor/device_google_gs101
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "[s5123][device] Change vendor telephony code path"

Browse source 
Revert "[s5300][google] Merge remote-tracking branch 'remotes/go..."

Revert "[s5123][shannon-rcs] Rename shannon_rcs_version"

Revert "[s5123][shannon-iwlan] Seperate source code by platform"

Revert "[s5123][google_device] Vendor telephony code assignment"

Revert "Add extra folders on vendor telephony codebase"

Revert "[modem-logging] Change vendor code folder path"

Revert "[s5300][device] Change vendor telephony code path"

Revert "[s5123][common] Seperate source code by platform"

Revert "[s5300][exynos-ril] Merge remote-tracking branch 'remote..."

Revert "Disable USE_LASSEN_OEMHOOK"

Revert "[s5300][shannon-iwlan] Merge remote-tracking branch 'rem..."

Revert "[zebu_zuma] Disable USE_LASSEN_OEMHOOK"

Revert "[s5123][packetrouter] Seperate source code by platform"

Revert "[s5300][common] Merge remote-tracking branch 'remotes/go..."

Revert "[s5300][shannon-ims] Merge remote-tracking branch 'remot..."

Revert submission 16405845-t-codebase-seperate

Reason for revert: Manifest changes have broken master builds
Reverted Changes:
I9bdd0eb06:[zebu_zuma] Disable USE_LASSEN_OEMHOOK
Ia811a3a06:[s5300][shannon-ims] Merge remote-tracking branch ...
I5b403ac84:[s5300][google] Merge remote-tracking branch 'remo...
I846bff687:[s5300][common] Merge remote-tracking branch 'remo...
I1f2977519:[s5300][packetrouter] Merge remote-tracking branch...
Ie9bf8d56a:[s5300][shannon-rcs] Merge remote-tracking branch ...
If09bed38e:[s5300][shannon-iwlan] Merge remote-tracking branc...
Ib05d1e76c:[s5300][exynos-ril] Merge remote-tracking branch '...
I678984712:Disable USE_LASSEN_OEMHOOK
I40370edcf:Add extra folders on vendor telephony codebase
I27bfb046d:[s5123][google_device] Vendor telephony code assig...
Ie41ecb085:[s5300][google_device] Vendor telephony code assig...
I666871fc7:[s5300][shannon-iwlan] Rename iwlan_version
Ibb5874125:[s5300][shannon-iwlan] Seperate source code by pla...
I93ef81871:[s5300][packetrouter] Seperate source code by plat...
Id664fdd7a:[s5123][shannon-rcs] Rename shannon_rcs_version
I62caeeb78:[s5123][shannon-iwlan] Rename iwlan_version
Ib72d6f2ff:[s5300][exynos-ril] Seperate source code by platfo...
Ibc7e7221d:[modem-logging] Change vendor code folder path
If822ecef2:[s5123][packetrouter] Seperate source code by plat...
Ia86317fd0:[s5123][common] Seperate source code by platform
I9e047c89e:[s5123][device] Change vendor telephony code path
I7b08ed2c3:[cat] Change vendor code folder path
I42a4a0e46:[s5123][shannon-iwlan] Seperate source code by pla...
I66360e4e1:[s5300][common] Seperate source code by platform
I58fc8ce33:[s5300][shannon-rcs] Rename shannon_rcs_version
Ibbcb2254a:[s5123][exynos-ril] Seperate source code by platfo...
I4a88242ce:[s5300][device] Change vendor telephony code path

Change-Id: I6df01ee6419c50a52f77fd97973b6b8a54897399
This commit is contained in:
Adam Wright 2022-01-04 13:35:29 +00:00
parent f0e200b9f9
commit 479f361d77
3 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
device-common.mk
View file

@ -14,7 +14,6 @@
# limitations under the License.
#
-include vendor/google_devices/gs101/proprietary/telephony/device-vendor.mk
include device/google/gs101/device.mk
# Telephony

10
device.mk
View file

@ -56,10 +56,6 @@ LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
ro.oem_unlock_supported=1
# Include vendor telephony soong namespace
PRODUCT_SOONG_NAMESPACES += \
vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
#Set IKE logs to verbose for WFC
PRODUCT_PROPERTY_OVERRIDES += log.tag.IKE=VERBOSE
@ -857,11 +853,11 @@ PRODUCT_PACKAGES += \
vts.bin
# This will be called only if IMSService is building with source code for dev branches.
$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/shannon-ims/device-vendor.mk)
$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/shannon-ims/device-vendor.mk)
PRODUCT_PACKAGES += ShannonIms
$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/shannon-iwlan/device-vendor.mk)
$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/shannon-iwlan/device-vendor.mk)
#RCS Test Messaging App
PRODUCT_PACKAGES_DEBUG += \
@ -887,7 +883,7 @@ USE_RADIO_HAL_1_6 := true
#$(call inherit-product, vendor/google_devices/gs101/proprietary/device-vendor.mk)
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/common/device-vendor.mk)
endif
ifeq (,$(filter %_64,$(TARGET_PRODUCT)))

2
telephony/user.mk
View file

@ -1,2 +1,2 @@
PRODUCT_COPY_FILES += vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device/samsung/init.radio.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.radio.sh
PRODUCT_COPY_FILES += vendor/samsung_slsi/telephony/common/device/samsung/init.radio.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.radio.sh
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/telephony/user/