rog3: rog2 --> rog3
diff --git a/device.mk b/device.mk
index 27489ca..b9d3439 100755
--- a/device.mk
+++ b/device.mk
@@ -19,195 +19,37 @@
# device-specific aspects (drivers) with a device-agnostic
# product configuration (apps).
#
-$(call inherit-product, vendor/asus/rog2/rog2-vendor.mk)
-$(call inherit-product-if-exists, vendor/gapps/arm64/arm64-vendor.mk)
-# Enable updating of APEXes
-$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
+# VNDK
+PRODUCT_TARGET_VNDK_VERSION := 29
# Overlays
DEVICE_PACKAGE_OVERLAYS += \
- $(LOCAL_PATH)/overlay \
- vendor/omni/overlay/CarrierConfig
-
-# A/B
-AB_OTA_UPDATER := true
-
-AB_OTA_PARTITIONS += \
- boot \
- dtbo \
- system \
- vbmeta
-
-AB_OTA_POSTINSTALL_CONFIG += \
- RUN_POSTINSTALL_system=true \
- POSTINSTALL_PATH_system=system/bin/omnipreopt_script \
- FILESYSTEM_TYPE_system=ext4 \
- POSTINSTALL_OPTIONAL_system=true
-
-PRODUCT_PACKAGES += \
- omnipreopt_script
-
-# ANT+
-PRODUCT_PACKAGES += \
- AntHalService
+ $(LOCAL_PATH)/overlay
# Api
-PRODUCT_SHIPPING_API_LEVEL := 28
+PRODUCT_SHIPPING_API_LEVEL := 29
# audio
PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_PRODUCT)/vendor_overlay/29/etc/audio/audio_policy_configuration.xml \
- $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_PRODUCT)/vendor_overlay/29/etc/audio_policy_configuration.xml \
- $(LOCAL_PATH)/audio/audio_policy_volumes_ZS660KL.xml:$(TARGET_COPY_OUT_PRODUCT)/vendor_overlay/29/etc/audio_policy_volumes_ZS660KL.xml
-
-# Boot control
-PRODUCT_PACKAGES += \
- android.hardware.boot@1.0-impl.recovery \
- bootctrl.msmnile.recovery
-
-PRODUCT_PACKAGES_DEBUG += \
- bootctl
-
-# Charger images
-PRODUCT_PACKAGES += \
- omni_charger_res_images \
- animation.txt \
- font_charger.png
-
-# DeviceParts
-PRODUCT_PACKAGES += \
- DeviceParts \
- OmniDisplayManager
-
-# Display
-PRODUCT_PACKAGES += \
- libdisplayconfig \
- libqdMetaData \
- libqdMetaData.system \
- libion \
- libtinyxml2
-
-PRODUCT_PACKAGES += \
- libtinyalsa
-
-# Exclude vibrator from InputManager
-PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/configs/excluded-input-devices.xml:system/etc/excluded-input-devices.xml
-
-# FM
-PRODUCT_PACKAGES += \
- FM2 \
- libqcomfm_jni \
- qcom.fmradio
-
-PRODUCT_BOOT_JARS += qcom.fmradio
-
-# Fingerprint
-PRODUCT_PACKAGES += \
- omni.biometrics.fingerprint.inscreen@1.0-service.asus_msmnile
-
-# Frameworks
-PRODUCT_PACKAGES += \
- FrameworksResOverlay
-
-# Init
-PRODUCT_PACKAGES += \
- libinit_rog2
-
-# Input
-PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/idc/goodix_ts.idc:system/usr/idc/goodix_ts.idc \
- $(LOCAL_PATH)/idc/goodix_ts_station.idc:system/usr/idc/goodix_ts_station.idc \
- $(LOCAL_PATH)/keychars/goodix_ts.kcm:system/usr/keychars/goodix_ts.kcm \
- $(LOCAL_PATH)/keylayout/goodix_ts.kl:system/usr/keylayout/goodix_ts.kl
-
-# Live Wallpapers
-PRODUCT_PACKAGES += \
- LiveWallpapers \
- LiveWallpapersPicker \
- VisualizationWallpapers \
- librs_jni
-
-# Lights
-PRODUCT_PACKAGES += \
- android.hardware.light@2.0-service.asus_msmnile
-
-# NFC - NQ (NXP)
-#PRODUCT_PACKAGES += \
- Tag \
- com.android.nfc_extras
-
-#PRODUCT_PACKAGES += \
- android.hardware.nfc@1.1 \
- android.hardware.nfc@1.0
+ $(LOCAL_PATH)/audio/audio_policy_configuration_ZS661KS.xml:$(TARGET_COPY_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/etc/audio/audio_policy_configuration.xml \
+ $(LOCAL_PATH)/audio/audio_policy_configuration_ZS661KS.xml:$(TARGET_COPY_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/etc/audio_policy_configuration.xml \
+ $(LOCAL_PATH)/audio/audio_policy_volumes_ZS661KS.xml:$(TARGET_COPY_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/etc/audio_policy_volumes_ZS661KS.xml
# Prebuilt
PRODUCT_COPY_FILES += \
- $(call find-copy-subdir-files,*,device/asus/rog2/prebuilt/system,system) \
- $(call find-copy-subdir-files,*,device/asus/rog2/prebuilt/root,root)
+ $(call find-copy-subdir-files,*,device/asus/rog3/prebuilt/system,system) \
+ $(call find-copy-subdir-files,*,device/asus/rog3/prebuilt/root,root)
PRODUCT_AAPT_CONFIG := normal
PRODUCT_AAPT_PREF_CONFIG := xxhdpi
-# Properties
-BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
-
-# Netutils
-PRODUCT_PACKAGES += \
- netutils-wrapper-1.0 \
- libandroid_net
-
-PRODUCT_PACKAGES += \
- vndk_package
-
-PRODUCT_PACKAGES += \
- android.hidl.base@1.0
-
-PRODUCT_PACKAGES += \
- vendor.display.config@1.5
-
-# Remove unwanted packages
-PRODUCT_PACKAGES += \
- RemovePackages
-
# Soong namespaces
PRODUCT_SOONG_NAMESPACES += \
$(LOCAL_PATH)
-# Telephony
-PRODUCT_PACKAGES += \
- ims-ext-common \
- ims_ext_common.xml \
- qti-telephony-hidl-wrapper \
- qti_telephony_hidl_wrapper.xml \
- qti-telephony-utils \
- qti_telephony_utils.xml \
- tcmiface
+# Inherit from asus sm8250-common
+$(call inherit-product, device/asus/sm8250-common/common.mk)
-# Update engine
-PRODUCT_PACKAGES += \
- otapreopt_script \
- update_engine \
- update_engine_sideload \
- update_verifier
-
-PRODUCT_HOST_PACKAGES += \
- brillo_update_payload
-
-PRODUCT_PACKAGES_DEBUG += \
- update_engine_client
-
-# Vibrator
-PRODUCT_PACKAGES += \
- android.hardware.vibrator@1.2-service.rog2
-
-PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/vintf/manifest.xml:$(TARGET_COPY_OUT_PRODUCT)/vendor_overlay/29/etc/vintf/manifest.xml
-
-# VNDK
-PRODUCT_TARGET_VNDK_VERSION := 29
-
-# WiFi Display
-PRODUCT_PACKAGES += \
- libnl
+# Inherit from vendor blobs
+$(call inherit-product, vendor/asus/rog3/rog3-vendor.mk)
\ No newline at end of file