AOSIP-ify all the things

CarbonROM · Aug 23, 2017 · 2c640d5 · 2c640d5
1 parent 0373219
commit 2c640d5
Show file tree

Hide file tree

Showing 20 changed files with 10 additions and 832 deletions.
diff --git a/BoardConfigCarbon.mk → BoardConfigAOSIP.mk b/BoardConfigCarbon.mk → BoardConfigAOSIP.mk
diff --git a/carbon.dependencies → aosip.dependencies b/carbon.dependencies → aosip.dependencies
diff --git a/carbon_marlin.mk → aosip_marlin.mk b/carbon_marlin.mk → aosip_marlin.mk
diff --git a/device-carbon.mk → device-aosip.mk b/device-carbon.mk → device-aosip.mk
@@ -10,7 +10,7 @@ PRODUCT_PACKAGES += \
     com.android.ims.rcsmanager
 
 # Overlays
-DEVICE_PACKAGE_OVERLAYS += device/google/marlin/overlay-carbon
+#DEVICE_PACKAGE_OVERLAYS += device/google/marlin/overlay-carbon
 
 # Pixel Experience
 PRODUCT_COPY_FILES += \

diff --git a/device-common.mk b/device-common.mk
@@ -1,3 +1,8 @@
+# Inherit prebuilt apps
+$(call inherit-product-if-exists, vendor/gapps/prebuilt.mk)
+#Build Gapps
+$(call inherit-product-if-exists, vendor/gapps/gapps.mk)
+
 #
 # Copyright (C) 2016 The Android Open-Source Project
 #

diff --git a/sailfish/BoardConfig.mk b/sailfish/BoardConfig.mk
@@ -4,7 +4,7 @@
 #
 
 # Allow Carbon config to override others
--include device/google/marlin/sailfish/BoardConfigCarbon.mk
+-include device/google/marlin/sailfish/BoardConfigAOSIP.mk
 
 TARGET_BOARD_PLATFORM := msm8996
 TARGET_BOOTLOADER_BOARD_NAME := sailfish

diff --git a/sailfish/BoardConfigAOSIP.mk b/sailfish/BoardConfigAOSIP.mk
@@ -0,0 +1,2 @@
+# BoardConfig for carbon_sailfish
+include device/google/marlin/BoardConfigAOSIP.mk
diff --git a/sailfish/BoardConfigCarbon.mk b/sailfish/BoardConfigCarbon.mk
diff --git a/sailfish/device-aosip.mk b/sailfish/device-aosip.mk
@@ -0,0 +1 @@
+$(call inherit-product, device/google/marlin/device-aosip.mk)
diff --git a/sailfish/device-carbon.mk b/sailfish/device-carbon.mk
diff --git a/telephony/Android.mk b/telephony/Android.mk
diff --git a/telephony/ims/Android.mk b/telephony/ims/Android.mk
diff --git a/telephony/ims/src/org/codeaurora/ims/QtiCallConstants.java b/telephony/ims/src/org/codeaurora/ims/QtiCallConstants.java
diff --git a/telephony/ims/src/org/codeaurora/ims/QtiImsExtListenerBaseImpl.java b/telephony/ims/src/org/codeaurora/ims/QtiImsExtListenerBaseImpl.java
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# BoardConfig for carbon_sailfish
		include device/google/marlin/BoardConfigAOSIP.mk
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		$(call inherit-product, device/google/marlin/device-aosip.mk)