poplar: Add Carbon configs

Change-Id: I7208497ac76ba2b6b0cfbe7e68855fa86a50ce41

AndroidProducts.mk

@@ -15,4 +15,4 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/lineage_poplar.mk
+    $(LOCAL_DIR)/carbon_poplar.mk

BoardConfig.mk

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 ### INHERIT FROM YOSHIRO
-include device/sony/yoshino/BoardConfigPlatform.mk
+include device/sony/yoshino-common/BoardConfigPlatform.mk
 include vendor/sony/poplar/BoardConfigVendor.mk
 
 DEVICE_PATH := device/sony/poplar

carbon.dependencies

@@ -0,0 +1,6 @@
+[
+  {
+    "repository": "CarbonROM/android_device_sony_yoshino-common",
+    "target_path": "device/sony/yoshino-common"
+  }
+]

lineage_poplar.mk → carbon_poplar.mk

@@ -15,11 +15,12 @@ TARGET_SCREEN_WIDTH := 1080
 # vendor/lineage/config/common.mk
 TARGET_BOOTANIMATION_HALF_RES := true
 
-### LINEAGE
-$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
+### Carbon
+$(call inherit-product, vendor/carbon/config/gsm.mk)
+$(call inherit-product, vendor/carbon/config/common.mk)
 
 ## Device identifier. This must come after all inclusions
-PRODUCT_NAME := lineage_poplar
+PRODUCT_NAME := carbon_poplar
 PRODUCT_DEVICE := poplar
 PRODUCT_BRAND := Sony
 PRODUCT_MODEL := G8341
@@ -30,11 +31,3 @@ PRODUCT_BUILD_PROP_OVERRIDES += \
     PRIVATE_BUILD_DESC="G8341-user 9 47.2.A.11.228 3311891731 release-keys"
 
 BUILD_FINGERPRINT := Sony/G8341/G8341:9/47.2.A.11.228/3311891731:user/release-keys
-
-ifneq ($(LINEAGE_DEV_CERTIFICATE),)
-    PRODUCT_DEFAULT_DEV_CERTIFICATE := $(LINEAGE_DEV_CERTIFICATE)
-endif
-
-ifneq ($(LINEAGE_VERITY_CERTIFICATE),)
-    PRODUCT_VERITY_SIGNING_KEY := $(LINEAGE_VERITY_CERTIFICATE)
-endif

device.mk

@@ -1,5 +1,5 @@
 ### PLATFORM
-$(call inherit-product, device/sony/yoshino/platform.mk)
+$(call inherit-product, device/sony/yoshino-common/platform.mk)
 ### PROPRIETARY VENDOR FILES
 $(call inherit-product, vendor/sony/poplar/poplar-vendor.mk)
 

extract-files.sh

@@ -27,7 +27,7 @@ if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
 
 LINEAGE_ROOT="$MY_DIR"/../../..
 
-HELPER="$LINEAGE_ROOT"/vendor/lineage/build/tools/extract_utils.sh
+HELPER="$LINEAGE_ROOT"/vendor/carbon/build/tools/extract_utils.sh
 if [ ! -f "$HELPER" ]; then
     echo "Unable to find helper script at $HELPER"
     exit 1

proprietary-files.txt

@@ -6,37 +6,6 @@ lib64/[email protected]
 lib64/libaptX_encoder.so|df1c89d7af1bb35808d5fe3496b04ba066c10cbc
 lib64/libaptXHD_encoder.so|e13fa70c97caaa24d061678bdee608eb8850a69e
 
-# CAMERA_APP
--app/CameraAddonPermission-release/CameraAddonPermission-release.apk
--app/CameraCommonPermission-release/CameraCommonPermission-release.apk
--app/CameraExtensionPermission-release/CameraExtensionPermission-release.apk
--app/ImageProcessorPermission-release/ImageProcessorPermission-release.apk
-etc/permissions/com.sonymobile.camera.addon.xml
-etc/permissions/com.sonymobile.imageprocessor.xml
-framework/com.sonymobile.camera.addon_impl.jar
-framework/com.sonymobile.imageprocessor.bypasscamera_impl.jar
--priv-app/ArtFilterCamera-xxhdpi-release/ArtFilterCamera-xxhdpi-release.apk
-priv-app/ArtFilterCamera-xxhdpi-release/lib/armeabi/libnativeeffectengine.so|dd45c2d805672b3c7d42357ddd543d3f9e904c6e
-priv-app/ArtFilterCamera-xxhdpi-release/lib/armeabi/libyuvframe.so|046d53a07d8ad57b86378a323dc8d88a00fadd1d
-lib/libimageprocessorjni.so
-lib64/libimageprocessorjni.so
--priv-app/CameraCommon/CameraCommon.apk
--priv-app/CameraPanorama-release/CameraPanorama-release.apk
-priv-app/CameraPanorama-release/lib/arm64/libmorpho_jpeg_io.so|a34ec70211e6f2094575986597df9e5734bbf7b0
-priv-app/CameraPanorama-release/lib/arm64/libmorpho_memory_allocator.so|f07bb0dc2c2141674668125a38e6c375a9359047
-priv-app/CameraPanorama-release/lib/arm64/libmorpho_panorama_gp2.so|cfa20065f3596bbdb06789ffeff6743f2bc0b37c
-priv-app/CameraPanorama-release/lib/arm64/libmorpho_sensor_fusion.so|7314bb37bf466d26e9edb50961c0464a8d24bb76
--priv-app/SemcCameraUI-xxhdpi-release/SemcCameraUI-xxhdpi-release.apk|863b862703e208c8d39c5c84bc40f075577b3430
-priv-app/SemcCameraUI-xxhdpi-release/lib/arm64/libarcsoft_handsigns.so|1a404edfbcf6bd54d4afdb3ac5b143bba489ed21
-priv-app/SemcCameraUI-xxhdpi-release/lib/arm64/libhandsigns_jni.so|9e3d163d1aea8878ff84ddb6f06cbb0c65610054
-priv-app/SemcCameraUI-xxhdpi-release/lib/arm64/libimage_converter.so|a196d0504d27f2eab598ad3822c36d68c5074057
-priv-app/SemcCameraUI-xxhdpi-release/lib/arm64/libmpbase.so|941457f34769d5cbf1ff33b13596307689317fc3
--priv-app/SomcMovieCreator-release/SomcMovieCreator-release.apk
--priv-app/SoundPhotoCamera-xxhdpi-release/SoundPhotoCamera-xxhdpi-release.apk
-priv-app/SoundPhotoCamera-xxhdpi-release/lib/armeabi/libmpo.so|dc60e4ca74b544f656897017f58114dc7835e65b
-priv-app/SoundPhotoCamera-xxhdpi-release/lib/armeabi/libnativebytebuffer.so|288df17ba8c7d21c8412e7787f3d36789858ca39
-priv-app/SoundPhotoCamera-xxhdpi-release/lib/armeabi/libspf.so|133c7e94bb6810de647c43e74a6cb981dfc24f4f
-
 # CAMERA
 bin/cacaoserver
 etc/init/cacaoserver.rc

setup-makefiles.sh

@@ -29,7 +29,7 @@ if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
 
 LINEAGE_ROOT="$MY_DIR"/../../..
 
-HELPER="$LINEAGE_ROOT"/vendor/lineage/build/tools/extract_utils.sh
+HELPER="$LINEAGE_ROOT"/vendor/carbon/build/tools/extract_utils.sh
 if [ ! -f "$HELPER" ]; then
     echo "Unable to find helper script at $HELPER"
     exit 1