Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: CarbonROM/android_device_google_marlin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cr-5.1
Choose a base ref
...
head repository: thebigdonny/android_device_google_marlin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cr-5.1
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 1 commit
  • 20 files changed
  • 1 contributor

Commits on Aug 23, 2017

  1. AOSIP-ify all the things

    thebigdonny committed Aug 23, 2017
    Copy the full SHA
    2c640d5 View commit details
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion device-carbon.mk → device-aosip.mk
Original file line number Diff line number Diff line change
@@ -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 += \
5 changes: 5 additions & 0 deletions device-common.mk
Original file line number Diff line number Diff line change
@@ -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
#
2 changes: 1 addition & 1 deletion sailfish/BoardConfig.mk
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions sailfish/BoardConfigAOSIP.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# BoardConfig for carbon_sailfish
include device/google/marlin/BoardConfigAOSIP.mk
2 changes: 0 additions & 2 deletions sailfish/BoardConfigCarbon.mk

This file was deleted.

1 change: 1 addition & 0 deletions sailfish/device-aosip.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$(call inherit-product, device/google/marlin/device-aosip.mk)
1 change: 0 additions & 1 deletion sailfish/device-carbon.mk

This file was deleted.

3 changes: 0 additions & 3 deletions telephony/Android.mk

This file was deleted.

19 changes: 0 additions & 19 deletions telephony/ims/Android.mk

This file was deleted.

194 changes: 0 additions & 194 deletions telephony/ims/src/org/codeaurora/ims/QtiCallConstants.java

This file was deleted.

This file was deleted.

124 changes: 0 additions & 124 deletions telephony/ims/src/org/codeaurora/ims/internal/IQtiImsExt.aidl

This file was deleted.

107 changes: 0 additions & 107 deletions telephony/ims/src/org/codeaurora/ims/internal/IQtiImsExtListener.aidl

This file was deleted.

56 changes: 0 additions & 56 deletions telephony/ims/src/org/codeaurora/ims/utils/QtiCallUtils.java

This file was deleted.

112 changes: 0 additions & 112 deletions telephony/ims/src/org/codeaurora/ims/utils/QtiImsExtUtils.java

This file was deleted.

18 changes: 0 additions & 18 deletions telephony/internal/Android.mk

This file was deleted.

126 changes: 0 additions & 126 deletions telephony/internal/src/org/codeaurora/internal/IExtTelephony.aidl

This file was deleted.