diff options
| author | Nolen Johnson <johnsonnolen@gmail.com> | 2022-06-18 03:03:03 -0400 |
|---|---|---|
| committer | marcost2 <marcostolcachir@gmail.com> | 2022-06-22 15:29:22 -0300 |
| commit | 5fba51d1dbab63261fcad24e3806cd75fa91151c (patch) | |
| tree | d3236b3e598490f1ed7609eb2dc922472d463b4a | |
| parent | 8daff807a7f3a0c559cc8b8e3d5ca84f3dad1fd8 (diff) | |
addison: Clean up makefiles and enforce presence of the necessary
* Deduplicate properties from vendor/lienage.
* Enforce presence of the necessary components.
* Remove no-ops/conflicting flags.
Change-Id: Id61b562020a3e10e21338bcb4f51ea04d49c6b93
| -rw-r--r-- | BoardConfig.mk | 4 | ||||
| -rw-r--r-- | device.mk | 23 |
2 files changed, 8 insertions, 19 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 8abe2c2..f243e7f 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. --include vendor/motorola/addison/BoardConfigVendor.mk +include vendor/motorola/addison/BoardConfigVendor.mk DEVICE_PATH := device/motorola/addison @@ -249,4 +249,4 @@ WIFI_DRIVER_FW_PATH_P2P := "p2p" WPA_SUPPLICANT_VERSION := VER_0_8_X TARGET_DISABLE_WCNSS_CONFIG_COPY := true PRODUCT_VENDOR_MOVE_ENABLED := true -WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true
\ No newline at end of file +WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true @@ -15,9 +15,7 @@ # limitations under the License. # Properties --include device/motorola/addison/vendor_prop.mk - -$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk) +include device/motorola/addison/vendor_prop.mk # Overlay DEVICE_PACKAGE_OVERLAYS += \ @@ -75,7 +73,7 @@ PRODUCT_PACKAGES += \ camera.device@3.2-impl \ libbson.vendor \ Snap \ - libwui + libwui PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/camera/msm8953_mot_camera.xml:$(TARGET_COPY_OUT_VENDOR)/etc/camera/msm8953_mot_camera.xml \ @@ -344,7 +342,7 @@ PRODUCT_PACKAGES += \ init.mmi.usb.rc \ init.qcom.rc \ init.recovery.qcom.rc \ - init.addison.rc + init.addison.rc PRODUCT_PACKAGES += \ init.qcom.sh \ @@ -394,23 +392,14 @@ PRODUCT_SOONG_NAMESPACES += $(LOCAL_PATH) PRODUCT_SYSTEM_SERVER_COMPILER_FILTER := speed-profile PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE := true PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION := frameworks/base/config/boot-image-profile.txt -PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK := true -DONT_DEXPREOPT_PREBUILTS := true USE_DEX2OAT_DEBUG := false PRODUCT_MINIMIZE_JAVA_DEBUG_INFO := true PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD := false -PRODUCT_DEXPREOPT_SPEED_APPS += \ - Settings \ - SystemUI - # Tethering PRODUCT_PACKAGES += \ TetheringConfigOverlay -PRODUCT_PROPERTY_OVERRIDES += \ - net.tethering.noprovisioning=true - PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/thermal-engine-addison.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine.conf @@ -429,8 +418,8 @@ PRODUCT_PACKAGES += \ # Update this list with what each blob is actually for # libstdc++: camera.msm8953 PRODUCT_PACKAGES += \ - libstdc++.vendor - + libstdc++.vendor + # Vibrator PRODUCT_PACKAGES += \ android.hardware.vibrator@1.0-service.addison @@ -448,7 +437,7 @@ PRODUCT_PACKAGES += \ wificond \ WifiOverlay \ wpa_supplicant \ - wpa_supplicant.conf + wpa_supplicant.conf PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/wifi/WCNSS_cfg.dat:$(TARGET_COPY_OUT_VENDOR)/firmware/wlan/prima/WCNSS_cfg.dat \ |